From b1c31f7a6f1cd37dad505ac2f2cc324f85d0341f Mon Sep 17 00:00:00 2001 From: Tunglies Date: Thu, 22 May 2025 10:25:00 +0800 Subject: [PATCH] Revert "fix: ensure app state is saved on exit and window events for better state management" This reverts commit 9af0803e9b36f6ee2e552515bd02fdb325a581f6. chore: update UPDATELOG --- UPDATELOG.md | 1 + src-tauri/capabilities/desktop.json | 3 +-- src-tauri/src/lib.rs | 28 ---------------------------- src-tauri/tauri.conf.json | 2 +- 4 files changed, 3 insertions(+), 31 deletions(-) diff --git a/UPDATELOG.md b/UPDATELOG.md index aab6b7af..0083ca80 100644 --- a/UPDATELOG.md +++ b/UPDATELOG.md @@ -25,6 +25,7 @@ - 修复 .window-state.json 无法删除的问题 - 无法修改配置更新 HTTP 请求超时 - 修复 getDelayFix 钩子问题 + - 使用外部扩展脚本覆写代理组时首页无法显示代理组 #### 新增了: - Mihomo(Meta)内核升级至 1.19.8 diff --git a/src-tauri/capabilities/desktop.json b/src-tauri/capabilities/desktop.json index e525e29f..823c9af9 100755 --- a/src-tauri/capabilities/desktop.json +++ b/src-tauri/capabilities/desktop.json @@ -17,7 +17,6 @@ "autostart:allow-enable", "autostart:allow-disable", "autostart:allow-is-enabled", - "core:window:allow-set-theme", - "window-state:default" + "core:window:allow-set-theme" ] } diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 2875ef9c..be95583a 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -342,26 +342,12 @@ pub fn run() { if code.is_none() { api.prevent_exit(); } - if let Some(app_handle) = core::handle::Handle::global().app_handle() { - logging_error!( - Type::Window, - true, - app_handle.save_window_state(StateFlags::all()) - ); - } } tauri::RunEvent::Exit => { // avoid duplicate cleanup if core::handle::Handle::global().is_exiting() { return; } - if let Some(app_handle) = core::handle::Handle::global().app_handle() { - logging_error!( - Type::Window, - true, - app_handle.save_window_state(StateFlags::all()) - ); - } feat::clean(); } tauri::RunEvent::WindowEvent { label, event, .. } => { @@ -380,13 +366,6 @@ pub fn run() { } else { logging!(warn, Type::Window, true, "尝试隐藏窗口但窗口不存在"); } - if let Some(app_handle) = core::handle::Handle::global().app_handle() { - logging_error!( - Type::Window, - true, - app_handle.save_window_state(StateFlags::all()) - ); - } } tauri::WindowEvent::Focused(true) => { #[cfg(target_os = "macos")] @@ -450,13 +429,6 @@ pub fn run() { hotkey::Hotkey::global().unregister("CMD+W") ); } - if let Some(app_handle) = core::handle::Handle::global().app_handle() { - logging_error!( - Type::Window, - true, - app_handle.save_window_state(StateFlags::all()) - ); - } } _ => {} } diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 3a94a215..149aad88 100755 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -74,4 +74,4 @@ "csp": null } } -} +} \ No newline at end of file