cpp/openttd-patchpack/source Changeset - r20958:1f91e72ac540

Changeset - r20958:1f91e72ac540

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 11 years ago 2013-11-17 16:16:55
rubidium@openttd.org

(svn r26028) -Fix [FS#5773]: make the installer warning about Windows XP SP3 not trigger on the 64 bit Windows XP which isn't really Windows XP to start with

1 file changed with 8 insertions and 1 deletions:

os/windows/installer/install.nsi

0 comments (0 inline, 0 general)

os/windows/installer/install.nsi

➞

Show inline comments

@@ @@ -545,15 +545,22 @@ FunctionEnd @@
 ;-------------------------------------------------------------------------------
 ; Determine windows version, returns "win9x" if Win9x/Me/2000/XP SP2- or "winnt" for the rest on the stack
 Function GetWindowsVersion
 	GetVersion::WindowsPlatformArchitecture
 	Pop $R0
 	IntCmp $R0 64 WinNT 0
 	ClearErrors
 	StrCpy $R0 "win9x"
 	${If} ${IsNT}
 		${If} ${IsWinXP}
 		${AndIf} ${AtLeastServicePack} 3
 		${OrIf} ${AtLeastWin2003}
-			StrCpy $R0 "winnt"
+			GoTo WinNT
 		${EndIf}
 	${EndIf}
 	GoTo Done
 WinNT:
 	StrCpy $R0 "winnt"
 Done:
 	Push $R0
 FunctionEnd

0 comments (0 inline, 0 general)