Skip to content

Commit 9a19226

Browse files
fix(nsis): uninstall fails when manually close app on kill app dialog (#14410)
1 parent fd8c30b commit 9a19226

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
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+
Fix uninstall fails if you close the app manually during the 'Click Ok to kill it' dialog

crates/tauri-bundler/src/bundle/windows/nsis/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ const NSIS_URL: &str =
4040
#[cfg(target_os = "windows")]
4141
const NSIS_SHA1: &str = "057e83c7d82462ec394af76c87d06733605543d4";
4242
const NSIS_TAURI_UTILS_URL: &str =
43-
"https://github.com/tauri-apps/nsis-tauri-utils/releases/download/nsis_tauri_utils-v0.5.1/nsis_tauri_utils.dll";
44-
const NSIS_TAURI_UTILS_SHA1: &str = "B053B2E5FDB97257954C8F935D80964F056520AE";
43+
"https://github.com/tauri-apps/nsis-tauri-utils/releases/download/nsis_tauri_utils-v0.5.2/nsis_tauri_utils.dll";
44+
const NSIS_TAURI_UTILS_SHA1: &str = "D0C502F45DF55C0465C9406088FF016C2E7E6817";
4545

4646
#[cfg(target_os = "windows")]
4747
const NSIS_REQUIRED_FILES: &[&str] = &[

crates/tauri-bundler/src/bundle/windows/nsis/utils.nsh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
Pop $R0
4949
Sleep 500
5050
${If} $R0 = 0
51+
${OrIf} $R0 = 2
5152
Goto app_check_done_${UniqueID}
5253
${Else}
5354
IfSilent silent_${UniqueID} ui_${UniqueID}

crates/tauri-utils/src/tokens.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ macro_rules! literal_struct {
2727

2828
/// Create a `String` constructor `TokenStream`.
2929
///
30-
/// e.g. `"Hello World" -> String::from("Hello World").
30+
/// e.g. `"Hello World"` -> `String::from("Hello World")`.
3131
/// This takes a `&String` to reduce casting all the `&String` -> `&str` manually.
3232
pub fn str_lit(s: impl AsRef<str>) -> TokenStream {
3333
let s = s.as_ref();

0 commit comments

Comments
 (0)