Skip to content

Commit 0ae53f4

Browse files
luoffeiamrbashir
andauthored
fix(bundler/nsis): fix error message appears even after successful uninstall, closes #7317 (#7361)
* fix(bundler/nsis): Uninstall the previous installation package * Update .changes/fix-nsis-uninstall-previous-version.md --------- Co-authored-by: Amr Bashir <amr.bashir2015@gmail.com>
1 parent 46df2c9 commit 0ae53f4

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'tauri-bundler': 'patch:bug'
3+
---
4+
5+
On Windows, fix NSIS installer showing an error dialog even when the previous version was uninstalled sucessfully.

tooling/bundler/src/bundle/windows/templates/installer.nsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,15 +243,14 @@ Function PageLeaveReinstall
243243
reinst_uninstall:
244244
HideWindow
245245
ClearErrors
246-
ExecWait '$R1 /P _?=$4' $0
247246

248247
${If} $R5 == "wix"
249248
ReadRegStr $R1 HKLM "$R6" "UninstallString"
250249
ExecWait '$R1' $0
251250
${Else}
252251
ReadRegStr $4 SHCTX "${MANUPRODUCTKEY}" ""
253252
ReadRegStr $R1 SHCTX "${UNINSTKEY}" "UninstallString"
254-
ExecWait '$R1 _?=$4' $0
253+
ExecWait '$R1 /P _?=$4' $0
255254
${EndIf}
256255

257256
BringToFront

0 commit comments

Comments
 (0)