pidgin: 605082e5: Fix a silly regression that I introduced...

datallah at pidgin.im datallah at pidgin.im
Mon Sep 21 14:12:27 EDT 2009


-----------------------------------------------------------------
Revision: 605082e5e72e95dface3580569a0737cbd95e368
Ancestor: 29f6b9d81574bfa9235dbd438a8934f06552e368
Author: datallah at pidgin.im
Date: 2009-09-21T18:03:23
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/605082e5e72e95dface3580569a0737cbd95e368

Modified files:
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

Fix a silly regression that I introduced in f1167f906624ca218b6fd2a39b10be205ca99892 where the win32 installer language selection would no longer work correctly.  Fixes #10243.

-------------- next part --------------
============================================================
--- pidgin/win32/nsis/pidgin-installer.nsi	a296a33ee8aedc4404a027d3d0df6eb0ac38204d
+++ pidgin/win32/nsis/pidgin-installer.nsi	8e5a52348c037b6bcd491dd65341abd6248da0e2
@@ -1345,13 +1345,14 @@ Function .onInit
   StrCpy $LANGUAGE_SET "0"
   ClearErrors
   ${GetOptions} "$R3" "/L=" $R1
-  IfErrors +3
+  IfErrors +4
   StrCpy $LANGUAGE $R1
   StrCpy $LANGUAGE_SET "1"
   Goto skip_lang
 
   ; Select Language
     ; Display Language selection dialog
+    !define MUI_LANGDLL_ALWAYSSHOW
     !insertmacro MUI_LANGDLL_DISPLAY
     skip_lang:
 


More information about the Commits mailing list