Commit 21d50404 authored by Andrew Lewman's avatar Andrew Lewman
Browse files

Fix up the strcmp logic to actually display the error message. Include

an explanation for spurious messageboxes for those curious as to their
existence


svn:r8744
parent c30a93d4
Loading
Loading
Loading
Loading
+3 −1
Changes for contrib/tor-mingw.nsi.in: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -130,8 +130,10 @@ Section "TorButton for FireFox" Torbutton
   File "${BIN}\torbutton-1.0.4-fx+tb.xpi"

   ReadRegStr $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\firefox.exe" "Path"
   ; This message box is for debugging
   MessageBox MB_OK "Firefox is installed at $1"
     StrCmp $1 "" +1 0
     StrCmp $1 "" +4 0 ; if Path is empty or null, then skip to an error, otherwise proceed normally
        ; This message box is for debugging
        MessageBox MB_OK "I'm going to run $1firefox.exe --install-global-extension $INSTDIR\torbutton"
	Exec '"$1firefox.exe" -install-global-extension $INSTDIR\torbutton-1.0.4-fx+tb.xpi'
	Goto +2