From e10284d2cf2067913a81ad5c897c16e086b9e3b8 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 30 Oct 2014 12:40:03 -0700 Subject: [PATCH] Windows installer: move the 32/64 bit check earlier It makes more sense to do this on init and not have the user go through any other screens in case this is the wrong binary. Signed-off-by: Dirk Hohndel --- packaging/windows/subsurface.nsi.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in index 58b59a66b..32c063672 100644 --- a/packaging/windows/subsurface.nsi.in +++ b/packaging/windows/subsurface.nsi.in @@ -83,11 +83,12 @@ #-------------------------------- # Default installer section -Section +Function .onInit !include x64.nsh ${If} 64BITBUILDTOKEN ${IfNot} ${RunningX64} - Abort "You cannot install the 64bit version of Subsurface on a 32bit version of Windows" + MessageBox MB_OK "You cannot install the 64bit version of Subsurface on a 32bit version of Windows" + Abort "Please download the 32bit version of the Subsurface installer" ${EndIf} ${Else} ${If} ${RunningX64} @@ -96,7 +97,9 @@ Section goforit: ${EndIf} ${Endif} +FunctionEnd +Section SetShellVarContext all # Installation path