mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-02 23:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Windows installer: move the 32/64 bit check earlier

Browse source 
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 <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-10-30 12:40:03 -07:00
parent a7771932be
commit d2567f761a
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packaging/windows/subsurface.nsi.in
View file

@ -83,11 +83,12 @@
#-------------------------------- #--------------------------------
# Default installer section # Default installer section
Section Function .onInit
!include x64.nsh !include x64.nsh
${If} 64BITBUILDTOKEN ${If} 64BITBUILDTOKEN
${IfNot} ${RunningX64} ${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} ${EndIf}
${Else} ${Else}
${If} ${RunningX64} ${If} ${RunningX64}
@ -96,7 +97,9 @@ Section
goforit: goforit:
${EndIf} ${EndIf}
${Endif} ${Endif}
FunctionEnd
Section
SetShellVarContext all SetShellVarContext all
# Installation path # Installation path