From 64a0faa42be3b292ffdfcbc5c8fac8c20d0a09d3 Mon Sep 17 00:00:00 2001
From: joostverburg <joostverburg@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Thu, 9 Oct 2003 14:41:51 +0000
Subject: [PATCH] header subtext can be changed without changing text

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

diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index a970ac27..c2219be3 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -146,14 +146,12 @@ Var MUI_TEMP2
 
 !macro MUI_HEADER_TEXT_PAGE TEXT SUBTEXT
 
-  !ifdef MUI_PAGE_HEADER_TEXT
-    !ifndef MUI_PAGE_HEADER_SUBTEXT
-      !insertmacro MUI_HEADER_TEXT "${MUI_PAGE_HEADER_TEXT}" "${SUBTEXT}"
-    !else
-      !insertmacro MUI_HEADER_TEXT "${MUI_PAGE_HEADER_TEXT}" "${MUI_PAGE_HEADER_SUBTEXT}"
-      !undef MUI_PAGE_HEADER_SUBTEXT
-    !endif
-    !undef MUI_PAGE_HEADER_TEXT
+  !ifdef MUI_PAGE_HEADER_TEXT & MUI_PAGE_HEADER_SUBTEXT
+    !insertmacro MUI_HEADER_TEXT "${MUI_PAGE_HEADER_TEXT}" "${MUI_PAGE_HEADER_SUBTEXT}"
+  !else ifdef MUI_PAGE_HEADER_TEXT
+    !insertmacro MUI_HEADER_TEXT "${MUI_PAGE_HEADER_TEXT}" "${SUBTEXT}"
+  !else ifdef MUI_PAGE_HEADER_SUBTEXT
+    !insertmacro MUI_HEADER_TEXT "${TEXT}" "${MUI_PAGE_HEADER_SUBTEXT}"
   !else
     !insertmacro MUI_HEADER_TEXT "${TEXT}" "${SUBTEXT}"
   !endif