d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-22 12:34:19 +00:00
Code Issues Projects Releases Wiki Activity

Fix running the uninstaller if the user chose a different path in the installer. Closes #6080.

Browse Source
This commit is contained in:
sledgehammer999 2017-04-05 03:04:59 +03:00
parent f3d6ae3433
commit 851fb8d3de
No known key found for this signature in database
GPG Key ID: 6E4A2D025B7CC9A2
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dist/windows/installer.nsi vendored
View File

@ -1,14 +1,17 @@
Section "-hidden" Var uninstallerPath
Section "-hidden"
;Search if qBittorrent is already installed. ;Search if qBittorrent is already installed.
FindFirst $0 $1 "$INSTDIR\uninst.exe" FindFirst $0 $1 "$uninstallerPath\uninst.exe"
FindClose $0 FindClose $0
StrCmp $1 "" done StrCmp $1 "" done
;Run the uninstaller of the previous install. ;Run the uninstaller of the previous install.
DetailPrint $(inst_unist) DetailPrint $(inst_unist)
ExecWait '"$INSTDIR\uninst.exe" /S _?=$INSTDIR' ExecWait '"$uninstallerPath\uninst.exe" /S _?=$uninstallerPath'
Delete "$INSTDIR\uninst.exe" Delete "$uninstallerPath\uninst.exe"
RMDir "$uninstallerPath"
done: done:
@ -208,6 +211,9 @@ Function .onInit
FindClose $0 FindClose $0
StrCmp $1 "" done StrCmp $1 "" done
;Copy old value to var so we can call the correct uninstaller
StrCpy $uninstallerPath $INSTDIR
;Inform the user ;Inform the user
MessageBox MB_OKCANCEL|MB_ICONINFORMATION $(inst_uninstall_question) /SD IDOK IDOK done MessageBox MB_OKCANCEL|MB_ICONINFORMATION $(inst_uninstall_question) /SD IDOK IDOK done
Quit Quit