From 60c3a6165e324b0b8d124b03e7cdad2acc4e2096 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sat, 27 Jan 2007 15:39:23 +0000
Subject: [PATCH] set __UNINSTALL__ in set_uninstall_mode, as in original patch
 #1644712 PageEx and PageExEnd set uninstall_mode in script.cpp, so setting
 this in set_code_type_predefines doesn't work it's probably better to set it
 in set_uninstall_mode as other commands probably use it as well

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4908 212acab6-be3b-0410-9dea-997c60f758d6
---
 Source/build.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Source/build.cpp b/Source/build.cpp
index d7432f28..8d05255f 100644
--- a/Source/build.cpp
+++ b/Source/build.cpp
@@ -2990,6 +2990,8 @@ void CEXEBuild::set_uninstall_mode(int un)
       cur_strlist=&ubuild_strlist;
       cur_langtables=&ubuild_langtables;
       cur_ctlcolors=&ubuild_ctlcolors;
+
+      definedlist.add("__UNINSTALL__");
     }
     else
     {
@@ -3005,6 +3007,8 @@ void CEXEBuild::set_uninstall_mode(int un)
       cur_strlist=&build_strlist;
       cur_langtables=&build_langtables;
       cur_ctlcolors=&build_ctlcolors;
+
+      definedlist.del("__UNINSTALL__");
     }
 
     SWAP(db_opt_save_u,db_opt_save,int);
@@ -3410,7 +3414,6 @@ void CEXEBuild::set_code_type_predefines(const char *value)
   definedlist.del("__FUNCTION__");
   definedlist.del("__PAGEEX__");
   definedlist.del("__GLOBAL__");
-  definedlist.del("__UNINSTALL__");
 
   switch (GetCurrentTokenPlace())
   {
@@ -3426,10 +3429,5 @@ void CEXEBuild::set_code_type_predefines(const char *value)
     default:
       definedlist.add("__GLOBAL__");
   }
-
-  if (uninstall_mode)
-  {
-    definedlist.add("__UNINSTALL__");
-  }
 }