Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24443
Modified Files:
Tag: b0_22_2
adduser-Version.nsh adduser.nsi
Log Message:
Fix the bug that stopped the wizard from using the same language
as the POPFile program installer when the installer is started
by a limited (or standard) user.
Index: adduser-Version.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v
retrieving revision 1.6.2.13
retrieving revision 1.6.2.14
diff -C2 -d -r1.6.2.13 -r1.6.2.14
*** adduser-Version.nsh 5 May 2007 12:28:07 -0000 1.6.2.13
--- adduser-Version.nsh 29 Jul 2007 17:13:19 -0000 1.6.2.14
***************
*** 7,11 ****
#--------------------------------------------------------------------------
! !define C_PFI_VERSION "0.3.9"
#--------------------------------------------------------------------------
--- 7,11 ----
#--------------------------------------------------------------------------
! !define C_PFI_VERSION "0.3.10"
#--------------------------------------------------------------------------
Index: adduser.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/adduser.nsi,v
retrieving revision 1.59.4.14
retrieving revision 1.59.4.15
diff -C2 -d -r1.59.4.14 -r1.59.4.15
*** adduser.nsi 5 May 2007 12:28:07 -0000 1.59.4.14
--- adduser.nsi 29 Jul 2007 17:13:19 -0000 1.59.4.15
***************
*** 747,758 ****
Pop $G_PFISETUP
StrCpy $G_PFIFLAG $G_PFISETUP 9
! StrCmp $G_PFIFLAG "/restore=" special_case
! StrCmp $G_PFISETUP "/install" special_case
StrCmp $G_PFISETUP "/installreboot" 0 normal_startup
SetRebootFlag true
! special_case:
ReadRegStr $LANGUAGE \
"HKCU" "SOFTWARE\POPFile Project\${C_PFI_PRODUCT}\MRI" "Installer Language"
Goto extract_files
--- 747,770 ----
Pop $G_PFISETUP
StrCpy $G_PFIFLAG $G_PFISETUP 9
! StrCmp $G_PFIFLAG "/restore=" restore_case
! StrCmp $G_PFISETUP "/install" install_case
StrCmp $G_PFISETUP "/installreboot" 0 normal_startup
SetRebootFlag true
! install_case:
ReadRegStr $LANGUAGE \
+ "HKLM" "SOFTWARE\POPFile Project\${C_PFI_PRODUCT}\MRI" "Installer Language"
+ Goto extract_files
+
+ restore_case:
+ ReadRegStr $G_PFIFLAG \
"HKCU" "SOFTWARE\POPFile Project\${C_PFI_PRODUCT}\MRI" "Installer Language"
+ StrCmp $G_PFIFLAG "" try_installer_language
+ StrCpy $LANGUAGE $G_PFIFLAG
+ Goto extract_files
+
+ try_installer_language:
+ ReadRegStr $LANGUAGE \
+ "HKLM" "SOFTWARE\POPFile Project\${C_PFI_PRODUCT}\MRI" "Installer Language"
Goto extract_files
|
