Session: Fix issue #67 by improving error handling

[pulseview.git] / contrib / pulseview_cross.nsi.in

diff --git a/contrib/pulseview_cross.nsi.in b/contrib/pulseview_cross.nsi.in
index 88945f44b214a5e7be774fb016b6c156ef8a265e..1cbd9eb1630741384d80756ab3fe0f51a8b8f9c6 100644 (file)
--- a/contrib/pulseview_cross.nsi.in
+++ b/contrib/pulseview_cross.nsi.in
@@ -43,7 +43,11 @@ Name "PulseView"
 OutFile "pulseview-@PV_VERSION_STRING@-installer.exe"
 
 # Where to install the application.
-InstallDir "$PROGRAMFILES\sigrok\PulseView"
+!ifdef PE64
+       InstallDir "$PROGRAMFILES64\sigrok\PulseView"
+!else
+       InstallDir "$PROGRAMFILES\sigrok\PulseView"
+!endif
 
 # Request admin privileges for Windows Vista and Windows 7.
 # http://nsis.sourceforge.net/Docs/Chapter4.html
@@ -184,6 +188,12 @@ Section "PulseView (required)" Section1
                0 SW_SHOWNORMAL \
                "" "Open-source, portable sigrok GUI"
 
+       # Create a shortcut for the PulseView application in "safe mode".
+       CreateShortCut "$SMPROGRAMS\sigrok\PulseView\PulseView (Safe Mode).lnk" \
+               "$INSTDIR\pulseview.exe" "-c -D" "$INSTDIR\pulseview.exe" \
+               0 SW_SHOWNORMAL \
+               "" "Open-source, portable sigrok GUI (Safe Mode)"
+
        # Create a shortcut for the PulseView application running in debug mode.
        CreateShortCut "$SMPROGRAMS\sigrok\PulseView\PulseView (Debug).lnk" \
                "$INSTDIR\pulseview.exe" "-l 5" "$INSTDIR\pulseview.exe" \
@@ -296,6 +306,7 @@ Section "Uninstall"
 
        # Delete the links from the start menu.
        Delete "$SMPROGRAMS\sigrok\PulseView\PulseView.lnk"
+       Delete "$SMPROGRAMS\sigrok\PulseView\PulseView (Safe Mode).lnk"
        Delete "$SMPROGRAMS\sigrok\PulseView\PulseView (Debug).lnk"
        Delete "$SMPROGRAMS\sigrok\PulseView\Uninstall PulseView.lnk"
        Delete "$SMPROGRAMS\sigrok\PulseView\Zadig (PulseView).lnk"