fix: result

libnyanpasu · Mar 2, 2022 · bcdae11 · bcdae11
1 parent f260d5d
commit bcdae11
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src-tauri/src/core/clash.rs b/src-tauri/src/core/clash.rs
@@ -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();

diff --git a/src-tauri/src/core/profiles.rs b/src-tauri/src/core/profiles.rs
@@ -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 })
   }
 }