shkong/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev synced 2025-05-05 05:13:44 +08:00
Code Packages Projects Releases Activity

fix: restart app failure

Browse Source
This commit is contained in:
huzibaca 2024-10-24 02:54:57 +08:00
parent 34af040c48
commit 97f434ad4a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src-tauri/src/core/tray.rs
View File

@ -1,7 +1,8 @@
use crate::{ use crate::{
cmds, cmds,
config::Config, config::Config,
feat, t, core::CoreManager,
feat, log_err, t,
utils::{ utils::{
dirs, dirs,
resolve::{self, VERSION}, resolve::{self, VERSION},
@ -330,7 +331,7 @@ fn create_tray_menu(
let restart_app = &MenuItem::with_id( let restart_app = &MenuItem::with_id(
app_handle, app_handle,
"restart_app", "restart_app",
t!("Restart App", "重启Verge", use_zh), t!("Restart App", "重启App", use_zh),
true, true,
None::<&str>, None::<&str>,
) )
@ -401,7 +402,15 @@ fn on_menu_event(app_handle: &AppHandle, event: MenuEvent) {
"open_core_dir" => crate::log_err!(cmds::open_core_dir()), "open_core_dir" => crate::log_err!(cmds::open_core_dir()),
"open_logs_dir" => crate::log_err!(cmds::open_logs_dir()), "open_logs_dir" => crate::log_err!(cmds::open_logs_dir()),
"restart_clash" => feat::restart_clash_core(), "restart_clash" => feat::restart_clash_core(),
"restart_app" => tauri::process::restart(&app_handle.env()), "restart_app" => {
tauri::async_runtime::block_on(async move {
log_err!(CoreManager::global().stop_core().await);
});
resolve::resolve_reset();
//睡1秒再重启
std::thread::sleep(std::time::Duration::from_secs(1));
tauri::process::restart(&app_handle.env());
}
"quit" => { "quit" => {
println!("quit"); println!("quit");
feat::quit(Some(0)); feat::quit(Some(0));