From 3a7bfe74e6184de275ce3822a52cf9765cd77be5 Mon Sep 17 00:00:00 2001
From: joostverburg <joostverburg@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Thu, 14 Oct 2004 15:43:24 +0000
Subject: [PATCH] The selected language is only stored in the registry when
 installation was succesful

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3730 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Modern UI/Changelog.txt | 15 +++++++++------
 Contrib/Modern UI/System.nsh    | 20 +++++++++++++-------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/Contrib/Modern UI/Changelog.txt b/Contrib/Modern UI/Changelog.txt
index f642d03c..3f9cad01 100644
--- a/Contrib/Modern UI/Changelog.txt	
+++ b/Contrib/Modern UI/Changelog.txt	
@@ -1,5 +1,8 @@
 NSIS Modern User Interface - VERSION HISTORY
 
+1.71 - October 14, 2004
+* The selected language is only stored in the registry when installation was succesful
+
 1.70 - February 6, 2004
 * Improved documentation
 * New Init custom function for Welcome and Finish page
@@ -23,7 +26,7 @@ NSIS Modern User Interface - VERSION HISTORY
 * Default header image
 * Support for uninstaller abort warning
 * Setting for 3 line text on Welcome and Finish page
-  (NOTE: New settings have been introduces in version 1.68)
+  (NOTE: New settings have been introduced in version 1.68)
 * Langauge file backwards compatibility: English for missing strings
 * Support for different uninstaller header image
 * Language selection dialog not displayed if installer is silent
@@ -37,8 +40,8 @@ NSIS Modern User Interface - VERSION HISTORY
 * New position for interface settings
 * Changed macro, setting names
 * Updated langauge system, new language files and settings
-* Removed MUI_BRANDINGTEXT. Use BrandingText command now.
-* Removed MUI_PRODUCT and MUI VERSION. Use Name command now.
+* Removed MUI_BRANDINGTEXT. You can use the standard BrandingText instruction.
+* Removed MUI_PRODUCT and MUI VERSION. You can use the standard Name instruction.
 
 1.65 - July 16, 2003
 * New page configuration system, no different system for installers with custom pages
@@ -106,7 +109,7 @@ NSIS Modern User Interface - VERSION HISTORY
 * Added define to show uninstall confirm page
 * Added language string for finish page title and continue to uninstall
 * Define for parameters for the application to run on the finish page
-* Bugfixes
+* Minor fixes
 
 1.6 - November 18, 2002
 * Welcome / Finish page
@@ -125,7 +128,7 @@ NSIS Modern User Interface - VERSION HISTORY
 * No more writing window titles & abort warnings to Install Options INI Files
 * Compatible with updated paging system
 * Renamed macros and defines
-* Some small fixes
+* Minor fixes
 
 1.4 - November 4, 2002
 * Uses new NSIS Page command
@@ -153,7 +156,7 @@ NSIS Modern User Interface - VERSION HISTORY
 * MultiLanguage.nsi uses the new language strings
 
 1.2 - September 22, 2002
-  (NOTE: All macors mentioned here have been removed in version 1.4)
+  (NOTE: All macros mentioned here have been removed in version 1.4)
   
 * Lots of macro system updates & fixes
 * InstallOptions support in macro system
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index fd0adebc..9a277778 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.70
+;NSIS Modern User Interface version 1.71
 ;Macro System
 ;Written by Joost Verburg
 
@@ -8,7 +8,7 @@
 ;License: License.txt
 ;Examples: Examples\Modern UI
 
-!echo "NSIS Modern User Interface version 1.70 - © 2002-2004 Joost Verburg"
+!echo "NSIS Modern User Interface version 1.71 - © 2002-2004 Joost Verburg"
 
 ;--------------------------------
 
@@ -1349,9 +1349,7 @@ Var MUI_TEMP2
     !insertmacro MUI_PAGE_FUNCTION_CUSTOM LEAVE
 
     !insertmacro MUI_ENDHEADER
-    !ifndef MUI_PAGE_UNINSTALLER
-      !insertmacro MUI_LANGDLL_SAVELANGUAGE
-    !endif
+    !insertmacro MUI_LANGDLL_SAVELANGUAGE
 
   FunctionEnd
 
@@ -1987,8 +1985,16 @@ Var MUI_TEMP2
 
 !macro MUI_LANGDLL_SAVELANGUAGE
 
-  !ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME
-    WriteRegStr "${MUI_LANGDLL_REGISTRY_ROOT}" "${MUI_LANGDLL_REGISTRY_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}" $LANGUAGE
+  !ifndef MUI_PAGE_UNINSTALLER
+    
+    IfAbort mui.langdllsavelanguage_abort
+    
+    !ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME
+      WriteRegStr "${MUI_LANGDLL_REGISTRY_ROOT}" "${MUI_LANGDLL_REGISTRY_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}" $LANGUAGE
+    !endif
+    
+    mui.langdllsavelanguage_abort:
+    
   !endif
 
 !macroend