Skip to content

Commit

Permalink
wininst: make the 64bit installer find the 32bit uninstaller
Browse files Browse the repository at this point in the history
So we correctly replace the old install
  • Loading branch information
lazka committed Feb 5, 2019
1 parent 9fc2508 commit 9dc501c
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions win_installer/misc/win_installer.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,21 @@ SectionEnd
Function .onInit
; Read the install dir and set it
Var /GLOBAL instdir_temp

SetRegView 32
ReadRegStr $instdir_temp HKLM "${QL_INSTDIR_KEY}" "${QL_INSTDIR_VALUENAME}"
SetRegView lastused
StrCmp $instdir_temp "" skip 0
StrCpy $INSTDIR $instdir_temp
skip:

SetRegView 64
ReadRegStr $instdir_temp HKLM "${QL_INSTDIR_KEY}" "${QL_INSTDIR_VALUENAME}"
SetRegView lastused
StrCmp $instdir_temp "" skip2 0
StrCpy $INSTDIR $instdir_temp
skip2:

StrCpy $EF_INST_BIN "$INSTDIR\bin\exfalso.exe"
StrCpy $QL_INST_BIN "$INSTDIR\bin\quodlibet.exe"
StrCpy $UNINST_BIN "$INSTDIR\uninstall.exe"
Expand Down

0 comments on commit 9dc501c

Please sign in to comment.