From 359ad0a0554de8b7878c93e27484ad9ccefc8ad9 Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Mon, 5 Dec 2011 22:52:54 +0000
Subject: [PATCH] Fix a couple of simple unicode merge and substart related
 bugs

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6195 212acab6-be3b-0410-9dea-997c60f758d6
---
 Examples/makensis.nsi | 2 +-
 Source/script.cpp     | 2 +-
 Source/tstring.h      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi
index 2e29e498..430eacd8 100644
--- a/Examples/makensis.nsi
+++ b/Examples/makensis.nsi
@@ -115,7 +115,7 @@ ${MementoSection} "NSIS Core Files (required)" SecCore
   RMDir /r $SMPROGRAMS\NSIS
 
   SetOverwrite on
-  File /oname=makensis.exe ..\Bin\substart.exe
+  File ..\makensis.exe
   File ..\makensisw.exe
   File ..\COPYING
   File ..\NSIS.chm
diff --git a/Source/script.cpp b/Source/script.cpp
index 75b86de0..eed1ef45 100644
--- a/Source/script.cpp
+++ b/Source/script.cpp
@@ -915,7 +915,7 @@ int CEXEBuild::LoadLicenseFile(TCHAR *file, TCHAR** pdata, LineParser &line, BOO
   }
   if (!memcmp(data+1,_T("{\\rtf"),5*sizeof(TCHAR)))
     *data = SF_RTF;
-  else if (unicode)
+  else if (*unicode)
     *data = SF_TEXT|SF_UNICODE;
   else
     *data = SF_TEXT;
diff --git a/Source/tstring.h b/Source/tstring.h
index 8dcb6842..2565f58b 100644
--- a/Source/tstring.h
+++ b/Source/tstring.h
@@ -38,7 +38,7 @@ typedef std::ofstream    tofstream;
 typedef std::ifstream    tifstream;
 // Use the following macros to open text files.
 #define FOPENTEXT(file, mode)           fopen(file, mode)
-#define FOPENTEXT2(file, mode, unicode) (*unicode=FALSE, fopen(file, mode))
+#define FOPENTEXT2(file, mode, unicode) (*(unicode)=FALSE, fopen(file, mode))
 #endif
 
 #ifndef _UNICODE