From 6bd2859dfd88c6d47563536cb0e4759406fda072 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Wed, 22 Dec 2010 21:09:33 +0100 Subject: [PATCH] Workaround to make installer work on Win2k. The "LockedList" Plug-in goes crazy on Win2k. On WinXP and Win7 all is fine, so we only use LockedList on WinXP+. --- etc/NSIS/setup.nsi | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi index 0efd4c8f..fe152bd4 100644 --- a/etc/NSIS/setup.nsi +++ b/etc/NSIS/setup.nsi @@ -480,20 +480,24 @@ FunctionEnd ;-------------------------------- Function LockedListShow - !insertmacro MUI_HEADER_TEXT "$(LAMEXP_LANG_LOCKEDLIST_HEADER)" "$(LAMEXP_LANG_LOCKEDLIST_TEXT)" - LockedList::AddModule "\LameXP.exe" - LockedList::AddModule "\Uninstall.exe" - LockedList::AddModule "\Au_.exe" - LockedList::Dialog /heading "$(LAMEXP_LANG_LOCKEDLIST_HEADING)" /noprograms "$(LAMEXP_LANG_LOCKEDLIST_NOPROG)" /searching "$(LAMEXP_LANG_LOCKEDLIST_SEARCH)" /colheadings "$(LAMEXP_LANG_LOCKEDLIST_COLHDR1)" "$(LAMEXP_LANG_LOCKEDLIST_COLHDR2)" - Pop $R0 + !insertmacro MUI_HEADER_TEXT "$(LAMEXP_LANG_LOCKEDLIST_HEADER)" "$(LAMEXP_LANG_LOCKEDLIST_TEXT)" + ${If} ${AtLeastWinXP} + LockedList::AddModule "\LameXP.exe" + LockedList::AddModule "\Uninstall.exe" + LockedList::AddModule "\Au_.exe" + ${EndIf} + LockedList::Dialog /heading "$(LAMEXP_LANG_LOCKEDLIST_HEADING)" /noprograms "$(LAMEXP_LANG_LOCKEDLIST_NOPROG)" /searching "$(LAMEXP_LANG_LOCKEDLIST_SEARCH)" /colheadings "$(LAMEXP_LANG_LOCKEDLIST_COLHDR1)" "$(LAMEXP_LANG_LOCKEDLIST_COLHDR2)" + Pop $R0 FunctionEnd Function un.LockedListShow - !insertmacro MUI_HEADER_TEXT "$(LAMEXP_LANG_LOCKEDLIST_HEADER)" "$(LAMEXP_LANG_LOCKEDLIST_TEXT)" - LockedList::AddModule "\LameXP.exe" - LockedList::AddModule "\Uninstall.exe" - LockedList::Dialog /heading "$(LAMEXP_LANG_LOCKEDLIST_HEADING)" /noprograms "$(LAMEXP_LANG_LOCKEDLIST_NOPROG)" /searching "$(LAMEXP_LANG_LOCKEDLIST_SEARCH)" /colheadings "$(LAMEXP_LANG_LOCKEDLIST_COLHDR1)" "$(LAMEXP_LANG_LOCKEDLIST_COLHDR2)" - Pop $R0 + !insertmacro MUI_HEADER_TEXT "$(LAMEXP_LANG_LOCKEDLIST_HEADER)" "$(LAMEXP_LANG_LOCKEDLIST_TEXT)" + ${If} ${AtLeastWinXP} + LockedList::AddModule "\LameXP.exe" + LockedList::AddModule "\Uninstall.exe" + ${EndIf} + LockedList::Dialog /heading "$(LAMEXP_LANG_LOCKEDLIST_HEADING)" /noprograms "$(LAMEXP_LANG_LOCKEDLIST_NOPROG)" /searching "$(LAMEXP_LANG_LOCKEDLIST_SEARCH)" /colheadings "$(LAMEXP_LANG_LOCKEDLIST_COLHDR1)" "$(LAMEXP_LANG_LOCKEDLIST_COLHDR2)" + Pop $R0 FunctionEnd