diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-10-30 12:40:03 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-10-30 12:40:03 -0700 |
| commit | d2567f761a1cff48e46849eff8e3e09073751210 (patch) | |
| tree | daa09ee8510027b74d94547c69c7769cb2a6930a /packaging | |
| parent | a7771932bec5551f18694f1c8c548f04e51c5b07 (diff) | |
| download | subsurface-d2567f761a1cff48e46849eff8e3e09073751210.tar.gz | |
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 <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/windows/subsurface.nsi.in | 7 |
1 files 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 |