Austin/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2024-11-16 11:42:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: result

Browse Source
This commit is contained in:
GyDi 2022-03-03 01:56:47 +08:00
parent f260d5df49
commit bcdae1169e
No known key found for this signature in database
GPG Key ID: 1C95E0D3467B3084
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src-tauri/src/core/clash.rs
View File

@ -301,6 +301,9 @@ impl Clash {
let info = self.info.clone();
let mut config = self.config.clone();
// generate the payload
let payload = profiles.gen_enhanced()?;
win.once(&event_name, move |event| {
if let Some(result) = event.payload() {
let gen_map: Mapping = serde_json::from_str(result).unwrap();
@ -312,9 +315,6 @@ impl Clash {
}
});
// generate the payload
let payload = profiles.gen_enhanced();
tauri::async_runtime::spawn(async move {
sleep(Duration::from_secs(5)).await;
win.emit("script-handler", payload).unwrap();

6
src-tauri/src/core/profiles.rs
View File

@ -438,8 +438,8 @@ impl Profiles {
}
/// gen the enhanced profiles
pub fn gen_enhanced(&self) -> PrfEnhanced {
let current = self.gen_activate().unwrap();
pub fn gen_enhanced(&self) -> Result<PrfEnhanced> {
let current = self.gen_activate()?;
let chain = match self.chain.as_ref() {
Some(chain) => chain
@ -454,7 +454,7 @@ impl Profiles {
None => vec![],
};
PrfEnhanced { current, chain }
Ok(PrfEnhanced { current, chain })
}
}