From fb77806ada9db175f81eac0884ad0fdbb94a41c4 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Mon, 7 Feb 2011 22:07:24 +0100 Subject: [PATCH] Removed installer workaround for a bug of the LockedList plug-in on Win2k, as the bug has finally been fixed. --- etc/NSIS/setup.nsi | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi index 99ae3d7d..47d74cd2 100644 --- a/etc/NSIS/setup.nsi +++ b/etc/NSIS/setup.nsi @@ -517,22 +517,18 @@ FunctionEnd Function LockedListShow !insertmacro MUI_HEADER_TEXT "$(LAMEXP_LANG_LOCKEDLIST_HEADER)" "$(LAMEXP_LANG_LOCKEDLIST_TEXT)" - ${If} ${AtLeastWinXP} - !insertmacro GetExecutableName $R0 - LockedList::AddModule "\$R0" - LockedList::AddModule "\Uninstall.exe" - LockedList::AddModule "\Au_.exe" - ${EndIf} + !insertmacro GetExecutableName $R0 + LockedList::AddModule "\$R0" + LockedList::AddModule "\Uninstall.exe" + LockedList::AddModule "\Au_.exe" LockedList::Dialog /autonext /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)" - ${If} ${AtLeastWinXP} - LockedList::AddModule "\LameXP.exe" - LockedList::AddModule "\Uninstall.exe" - ${EndIf} + LockedList::AddModule "\LameXP.exe" + LockedList::AddModule "\Uninstall.exe" LockedList::Dialog /autonext /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