From 603dcbe239214f5818499e9d43d046fff27793a9 Mon Sep 17 00:00:00 2001 From: kichik Date: Mon, 24 Mar 2003 14:50:35 +0000 Subject: [PATCH] Leave function not show function in error git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2355 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/build.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/build.cpp b/Source/build.cpp index 30eaec28..66c72bc5 100644 --- a/Source/build.cpp +++ b/Source/build.cpp @@ -1075,7 +1075,7 @@ int CEXEBuild::resolve_coderefs(const char *str) int i = 0; while (i < build_uninst.common.num_pages) { if (resolve_call_int("uninstall pages","pre-page",p->prefunc,&p->prefunc)) return 1; - if (resolve_call_int("uninstall pages","show-page",p->showfunc,&p->showfunc)) return 1; + if (resolve_call_int("uninstall pages",p->id?"show-page":"leave-page",p->showfunc,&p->showfunc)) return 1; if (resolve_call_int("uninstall pages","leave-page",p->leavefunc,&p->leavefunc)) return 1; p++; i++; @@ -1106,9 +1106,9 @@ int CEXEBuild::resolve_coderefs(const char *str) page *p=(page *)build_pages.get(); int i = 0; while (i < build_header.common.num_pages) { - if (resolve_call_int("pages","pre-page function",p->prefunc,&p->prefunc)) return 1; - if (resolve_call_int("pages","show-page function",p->showfunc,&p->showfunc)) return 1; - if (resolve_call_int("pages","leave-page function",p->leavefunc,&p->leavefunc)) return 1; + if (resolve_call_int("pages","pre-page",p->prefunc,&p->prefunc)) return 1; + if (resolve_call_int("pages",p->id?"show-page":"leave-page",p->showfunc,&p->showfunc)) return 1; + if (resolve_call_int("pages","leave-page",p->leavefunc,&p->leavefunc)) return 1; p++; i++; }