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

fix: runtime error

Browse Source
This commit is contained in:
MystiPanda 2024-06-19 10:43:58 +08:00
parent e6e2b1f142
commit 0342477733
No known key found for this signature in database
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src-tauri/src/core/clash_api.rs
View File

@ -85,6 +85,7 @@ fn clash_client_info() -> Result<(String, HeaderMap)> {
}
/// 缩短clash的日志
#[allow(dead_code)]
pub fn parse_log(log: String) -> String {
if log.starts_with("time=") && log.len() > 33 {
return (log[33..]).to_owned();

22
src-tauri/src/core/core.rs
View File

@ -76,7 +76,24 @@ impl CoreManager {
None => false,
};
self.stop_core()?; // 先停止
// 关闭tun模式
let mut disable = Mapping::new();
let mut tun = Mapping::new();
tun.insert("enable".into(), false.into());
disable.insert("tun".into(), tun.into());
log::debug!(target: "app", "disable tun mode");
let _ = clash_api::patch_configs(&disable).await;
let mut system = System::new();
system.refresh_all();
let procs = system.processes_by_name("verge-mihomo");
for proc in procs {
log::debug!(target: "app", "kill all clash process");
#[cfg(target_os = "windows")]
proc.kill();
#[cfg(not(target_os = "windows"))]
proc.kill_with(sysinfo::Signal::Interrupt);
}
if *self.use_service_mode.lock() {
log::debug!(target: "app", "stop the core by service");
@ -232,7 +249,10 @@ impl CoreManager {
let procs = system.processes_by_name("verge-mihomo");
for proc in procs {
log::debug!(target: "app", "kill all clash process");
#[cfg(target_os = "windows")]
proc.kill();
#[cfg(not(target_os = "windows"))]
proc.kill_with(sysinfo::Signal::Interrupt);
}
Ok(())
}