From 2508cbce0ceea95b4552c78642c5eca34e5ed690 Mon Sep 17 00:00:00 2001
From: joostverburg <joostverburg@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sat, 27 Sep 2003 22:41:52 +0000
Subject: [PATCH] no error when unused uninst license/directory page strings do
 not exist

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

diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index a401f4d9..22a20153 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -2129,6 +2129,26 @@ Var MUI_TEMP2
     !undef "${NAME}"
   !endif
   
+!macroend
+
+!macro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE_NOTREQUIRED PAGE NAME
+
+  !ifdef "${NAME}"
+    !ifdef MUI_UNINSTALLER
+      !ifdef MUI_UN${PAGE}PAGE
+        LangString "${NAME}" 0 "${${NAME}}"
+        !undef "${NAME}"
+      !else
+        !undef "${NAME}"
+      !endif
+    !else
+      !undef "${NAME}"
+    !endif
+  !else
+    !ifdef MUI_UN${PAGE}PAGE
+      !error "The ${LANGUAGE} Modern UI language file does not support the uninstaller ${PAGE} page"
+    !endif
+  !endif  
   
 !macroend
 
@@ -2247,22 +2267,22 @@ Var MUI_TEMP2
   !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE CONFIRM "MUI_UNTEXT_CONFIRM_TITLE"
   !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE CONFIRM "MUI_UNTEXT_CONFIRM_SUBTITLE"
   
-  !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE LICENSE "MUI_UNTEXT_LICENSE_TITLE"
-  !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE LICENSE "MUI_UNTEXT_LICENSE_SUBTITLE"
+  !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE_NOTREQUIRED LICENSE "MUI_UNTEXT_LICENSE_TITLE"
+  !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE_NOTREQUIRED LICENSE "MUI_UNTEXT_LICENSE_SUBTITLE"
   !ifndef MUI_LICENSEPAGE
     !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_INNERTEXT_LICENSE_TOP"
   !else
     !undef MUI_INNERTEXT_LICENSE_TOP
   !endif
-  !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE LICENSE "MUI_UNINNERTEXT_LICENSE_BOTTOM"
-  !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE LICENSE "MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX"
-  !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE LICENSE "MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS"
+  !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE_NOTREQUIRED LICENSE "MUI_UNINNERTEXT_LICENSE_BOTTOM"
+  !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE_NOTREQUIRED LICENSE "MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX"
+  !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE_NOTREQUIRED LICENSE "MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS"
 
   !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE COMPONENTS "MUI_UNTEXT_COMPONENTS_TITLE"
   !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE COMPONENTS "MUI_UNTEXT_COMPONENTS_SUBTITLE"
 
-  !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE DIRECTORY "MUI_UNTEXT_DIRECTORY_TITLE"
-  !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE DIRECTORY  "MUI_UNTEXT_DIRECTORY_SUBTITLE"
+  !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE_NOTREQUIRED DIRECTORY "MUI_UNTEXT_DIRECTORY_TITLE"
+  !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING_PAGE_NOTREQUIRED DIRECTORY  "MUI_UNTEXT_DIRECTORY_SUBTITLE"
    
   !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_FINISH_TITLE"
   !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_FINISH_SUBTITLE"