aboutsummaryrefslogtreecommitdiff
path: root/dists/win32
diff options
context:
space:
mode:
authorLittleboy2011-07-01 16:40:48 -0400
committerLittleboy2011-07-04 14:26:27 -0400
commitde8c606c1224009a7f4cb92a7f212157a6160966 (patch)
tree8cf812696e4ce4194b835b3b0fabc61b6e18c4e5 /dists/win32
parentf88ef9b96589f29104ffd2b3900d6ed7bf8ed343 (diff)
downloadscummvm-rg350-de8c606c1224009a7f4cb92a7f212157a6160966.tar.gz
scummvm-rg350-de8c606c1224009a7f4cb92a7f212157a6160966.tar.bz2
scummvm-rg350-de8c606c1224009a7f4cb92a7f212157a6160966.zip
NSIS: Handle case when the Games.dll plugin cannot be loaded (and skip shortcut creation)
Diffstat (limited to 'dists/win32')
-rw-r--r--dists/win32/scummvm.nsi1
-rw-r--r--dists/win32/scummvm.nsi.in1
2 files changed, 2 insertions, 0 deletions
diff --git a/dists/win32/scummvm.nsi b/dists/win32/scummvm.nsi
index f5eb584a42..01a7e72afe 100644
--- a/dists/win32/scummvm.nsi
+++ b/dists/win32/scummvm.nsi
@@ -292,6 +292,7 @@ Section "ScummVM" SecMain
# This is for Vista only, for 7 the tasks are defined in the gdf xml
${If} $0 != "0"
${AndIf} $0 != ""
+ ${AndIf} $0 != "$INSTDIR\scummvm.exe"
CreateDirectory "$0\PlayTasks\0"
CreateShortcut "$0\PlayTasks\0\Play.lnk" "$INSTDIR\scummvm.exe" "--no-console"
CreateDirectory "$0\PlayTasks\1"
diff --git a/dists/win32/scummvm.nsi.in b/dists/win32/scummvm.nsi.in
index 51a299905b..cba1e81e33 100644
--- a/dists/win32/scummvm.nsi.in
+++ b/dists/win32/scummvm.nsi.in
@@ -292,6 +292,7 @@ Section "ScummVM" SecMain
# This is for Vista only, for 7 the tasks are defined in the gdf xml
${If} $0 != "0"
${AndIf} $0 != ""
+ ${AndIf} $0 != "$INSTDIR\scummvm.exe"
CreateDirectory "$0\PlayTasks\0"
CreateShortcut "$0\PlayTasks\0\Play.lnk" "$INSTDIR\scummvm.exe" "--no-console"
CreateDirectory "$0\PlayTasks\1"