diff --git a/.changes/nsis-uninstall-already-killed.md b/.changes/nsis-uninstall-already-killed.md new file mode 100644 index 000000000..5bf9b70e8 --- /dev/null +++ b/.changes/nsis-uninstall-already-killed.md @@ -0,0 +1,5 @@ +--- +'tauri-bundler': 'patch:bug' +--- + +Fix uninstall fails if you close the app manually during the 'Click Ok to kill it' dialog diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/mod.rs b/crates/tauri-bundler/src/bundle/windows/nsis/mod.rs index d1729c82f..f4addc79f 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/mod.rs +++ b/crates/tauri-bundler/src/bundle/windows/nsis/mod.rs @@ -40,8 +40,8 @@ const NSIS_URL: &str = #[cfg(target_os = "windows")] const NSIS_SHA1: &str = "057e83c7d82462ec394af76c87d06733605543d4"; const NSIS_TAURI_UTILS_URL: &str = - "https://github.com/tauri-apps/nsis-tauri-utils/releases/download/nsis_tauri_utils-v0.5.1/nsis_tauri_utils.dll"; -const NSIS_TAURI_UTILS_SHA1: &str = "B053B2E5FDB97257954C8F935D80964F056520AE"; + "https://github.com/tauri-apps/nsis-tauri-utils/releases/download/nsis_tauri_utils-v0.5.2/nsis_tauri_utils.dll"; +const NSIS_TAURI_UTILS_SHA1: &str = "D0C502F45DF55C0465C9406088FF016C2E7E6817"; #[cfg(target_os = "windows")] const NSIS_REQUIRED_FILES: &[&str] = &[ diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/utils.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/utils.nsh index 88b82b0f8..3c5bf75f5 100644 --- a/crates/tauri-bundler/src/bundle/windows/nsis/utils.nsh +++ b/crates/tauri-bundler/src/bundle/windows/nsis/utils.nsh @@ -48,6 +48,7 @@ Pop $R0 Sleep 500 ${If} $R0 = 0 + ${OrIf} $R0 = 2 Goto app_check_done_${UniqueID} ${Else} IfSilent silent_${UniqueID} ui_${UniqueID} diff --git a/crates/tauri-utils/src/tokens.rs b/crates/tauri-utils/src/tokens.rs index c02fb1fdc..3c566a377 100644 --- a/crates/tauri-utils/src/tokens.rs +++ b/crates/tauri-utils/src/tokens.rs @@ -27,7 +27,7 @@ macro_rules! literal_struct { /// Create a `String` constructor `TokenStream`. /// -/// e.g. `"Hello World" -> String::from("Hello World"). +/// e.g. `"Hello World"` -> `String::from("Hello World")`. /// This takes a `&String` to reduce casting all the `&String` -> `&str` manually. pub fn str_lit(s: impl AsRef) -> TokenStream { let s = s.as_ref();