tauri-apps/archived-tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-01-31 00:35:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(nsis): uninstall fails when manually close app on kill app dialog (#14410)

Browse Source
This commit is contained in:
Tony
2025-11-04 17:18:21 +08:00
committed by GitHub
parent fd8c30b4f1
commit 9a19226369
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/nsis-uninstall-already-killed.md Normal file
View File

@@ -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

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

@@ -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] = &[

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

@@ -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}

2
crates/tauri-utils/src/tokens.rs
View File

@@ -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<str>) -> TokenStream {
let s = s.as_ref();