From 6e5ed120864794d5c4a00d045845497d225405ea Mon Sep 17 00:00:00 2001 From: joostverburg Date: Sun, 7 Sep 2003 16:36:46 +0000 Subject: [PATCH] finish page works without welcome page; uninst dir page strings not included when there is only an inst dir page git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2875 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI/System.nsh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index 2f9204b1..5d9edde5 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -714,14 +714,16 @@ Var MUI_TEMP2 !define MUI_FINISHPAGE !endif - !ifdef MUI_FINISHPAGE - !ifndef MUI_FINISHPAGE_NOAUTOCLOSE - AutoCloseWindow true - !endif - !ifdef MUI_FINISHPAGE_LINK - !ifndef MUI_FINISHPAGE_LINK_COLOR - !define MUI_FINISHPAGE_LINK_COLOR "0x800000" - !endif + !ifndef MUI_BGCOLOR + !define MUI_BGCOLOR "FFFFFF" + !endif + + !ifndef MUI_FINISHPAGE_NOAUTOCLOSE + AutoCloseWindow true + !endif + !ifdef MUI_FINISHPAGE_LINK + !ifndef MUI_FINISHPAGE_LINK_COLOR + !define MUI_FINISHPAGE_LINK_COLOR "0x800000" !endif !endif @@ -2154,7 +2156,7 @@ Var MUI_TEMP2 !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNTEXT_COMPONENTS_SUBTITLE" !endif - !ifdef MUI_DIRECTORYPAGE + !ifdef MUI_UNDIRECTORYPAGE !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNTEXT_DIRECTORY_TITLE" !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNTEXT_DIRECTORY_SUBTITLE" !endif