From 8abbcd3700dd69e59cc7d3bf50ca520c74c6bda3 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Sun, 17 Nov 2013 16:16:55 +0000
Subject: (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

---
 os/windows/installer/install.nsi | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'os/windows/installer/install.nsi')

diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi
index c2045788e..cdde70a63 100644
--- a/os/windows/installer/install.nsi
+++ b/os/windows/installer/install.nsi
@@ -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
 
-- 
cgit v1.2.3-70-g09d2