purgatory/clash-verge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: kill clash when exit in service mode, close #241

Browse Source
This commit is contained in:
GyDi 2022-10-22 13:55:06 +08:00
parent c9d9909d74
commit 294d980b52
No known key found for this signature in database
GPG Key ID: 1C95E0D3467B3084
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src-tauri/src/core/service.rs
View File

@ -22,6 +22,9 @@ pub struct Service {
sidecar: Option<CommandChild>, sidecar: Option<CommandChild>,
logs: Arc<RwLock<VecDeque<String>>>, logs: Arc<RwLock<VecDeque<String>>>,
#[allow(unused)]
use_service_mode: bool,
} }
impl Service { impl Service {
@ -31,6 +34,7 @@ impl Service {
Service { Service {
sidecar: None, sidecar: None,
logs: Arc::new(RwLock::new(queue)), logs: Arc::new(RwLock::new(queue)),
use_service_mode: false,
} }
} }
@ -46,6 +50,8 @@ impl Service {
verge.enable_service_mode.clone().unwrap_or(false) verge.enable_service_mode.clone().unwrap_or(false)
}; };
self.use_service_mode = enable;
if !enable { if !enable {
return self.start_clash_by_sidecar(); return self.start_clash_by_sidecar();
} }
@ -74,14 +80,8 @@ impl Service {
{ {
let _ = self.stop_clash_by_sidecar(); let _ = self.stop_clash_by_sidecar();
let enable = { if self.use_service_mode {
let data = Data::global(); tauri::async_runtime::block_on(async move {
let verge = data.verge.lock();
verge.enable_service_mode.clone().unwrap_or(false)
};
if enable {
tauri::async_runtime::spawn(async move {
log_if_err!(Self::stop_clash_by_service().await); log_if_err!(Self::stop_clash_by_service().await);
}); });
} }