From 276cde7ee7d552ad9f475308f3378923f70b4863 Mon Sep 17 00:00:00 2001
From: ramon18 <ramon18@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 17 Oct 2003 19:55:15 +0000
Subject: [PATCH] Fixed hidden controls in header if welcome page is skipped

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3030 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Modern UI/System.nsh | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index d187b839..9abe662c 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -1100,6 +1100,22 @@ Var MUI_TEMP2
 
   Function "${PRE}"
   
+    !ifndef MUI_WELCOMEPAGE_TITLE
+      !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "$(MUI_TEXT_WELCOME_INFO_TITLE)"
+    !else
+      !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "${MUI_WELCOMEPAGE_TITLE}"
+      !undef MUI_WELCOMEPAGE_TITLE
+    !endif
+    
+    !ifndef MUI_WELCOMEPAGE_TEXT
+      !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Text" "$(MUI_TEXT_WELCOME_INFO_TEXT)"
+    !else
+      !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Text" "${MUI_WELCOMEPAGE_TEXT}"
+      !undef MUI_WELCOMEPAGE_TEXT
+    !endif
+
+    !insertmacro MUI_FUNCTION_CUSTOM PRE
+    
     GetDlgItem $MUI_TEMP1 $HWNDPARENT 1028
     ShowWindow $MUI_TEMP1 ${SW_HIDE}
 
@@ -1118,22 +1134,6 @@ Var MUI_TEMP2
     GetDlgItem $MUI_TEMP1 $HWNDPARENT 1045
     ShowWindow $MUI_TEMP1 ${SW_NORMAL}
 
-    !ifndef MUI_WELCOMEPAGE_TITLE
-      !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "$(MUI_TEXT_WELCOME_INFO_TITLE)"
-    !else
-      !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "${MUI_WELCOMEPAGE_TITLE}"
-      !undef MUI_WELCOMEPAGE_TITLE
-    !endif
-    
-    !ifndef MUI_WELCOMEPAGE_TEXT
-      !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Text" "$(MUI_TEXT_WELCOME_INFO_TEXT)"
-    !else
-      !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Text" "${MUI_WELCOMEPAGE_TEXT}"
-      !undef MUI_WELCOMEPAGE_TEXT
-    !endif
-
-    !insertmacro MUI_FUNCTION_CUSTOM PRE
-    
     !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "ioSpecial.ini"
     Pop $MUI_HWND
     SetCtlColors $MUI_HWND "" "${MUI_BGCOLOR}"