From: lordmulder <mulder2@gmx.de>
Date: Mon, 28 Mar 2011 02:25:06 +0000 (+0200)
Subject: Make sure the language selection dialog is shown on systems that don't use UAC (like... 
X-Git-Tag: Release_401~10
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3af79d261b41c552eeee750abff7f0c398d7d996;p=lamexp%2FLameXP.git

Make sure the language selection dialog is shown on systems that don't use UAC (like Windows XP). On these systems there will be no "inner" instance of the installer.
---

diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi
index 0a7ae36f..9a327a50 100644
--- a/etc/NSIS/setup.nsi
+++ b/etc/NSIS/setup.nsi
@@ -251,6 +251,8 @@ UninstPage Custom un.LockedListShow
 Function .onInit
 	${If} ${UAC_IsInnerInstance}
 		!insertmacro MUI_LANGDLL_DISPLAY
+	${ElseIf} ${UAC_IsAdmin}
+		!insertmacro MUI_LANGDLL_DISPLAY
 	${Else}
 		System::Call 'kernel32::CreateMutexA(i 0, i 0, t "{2B3D1EBF-B3B6-4E93-92B9-6853029A7162}") i .r1 ?e'
 		Pop $0
@@ -276,6 +278,8 @@ FunctionEnd
 Function un.onInit
 	${If} ${UAC_IsInnerInstance}
 		!insertmacro MUI_LANGDLL_DISPLAY
+	${ElseIf} ${UAC_IsAdmin}
+		!insertmacro MUI_LANGDLL_DISPLAY
 	${Else}
 		System::Call 'kernel32::CreateMutexA(i 0, i 0, t "{2B3D1EBF-B3B6-4E93-92B9-6853029A7162}") i .r1 ?e'
 		Pop $0
@@ -313,9 +317,10 @@ Function MyUacInit
 	
 	!ifdef LAMEXP_IS_PRERELEASE
 		!insertmacro GetCommandlineParameter "Update" "?" $R0
-		StrCmp $R0 "?" 0 +3
+		StrCmp $R0 "?" 0 SkipPrereleaseWarning
 		MessageBox MB_TOPMOST|MB_ICONEXCLAMATION|MB_OKCANCEL "$(LAMEXP_LANG_PRERELEASE_WARNING)" /SD IDOK IDOK +2
 		Abort
+		SkipPrereleaseWarning:
 	!endif
 FunctionEnd