fix double serialize on invoke (#5639)

Co-authored-by: LucasJavaudin <lucas.javaudin@cyu.fr> Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
tauri-apps · Nov 20, 2022 · 677838c · 677838c
1 parent 168c3d0
commit 677838c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.changes/fix-invoke-double-serialize.md b/.changes/fix-invoke-double-serialize.md
@@ -0,0 +1,5 @@
+---
+"tauri": patch
+---
+
+Fixes a double serialization on the IPC.
diff --git a/core/tauri/src/hooks.rs b/core/tauri/src/hooks.rs
@@ -193,7 +193,11 @@ impl<R: Runtime> InvokeResolver<R> {
     F: Future<Output = Result<JsonValue, InvokeError>> + Send + 'static,
   {
     crate::async_runtime::spawn(async move {
-      Self::return_result(self.window, task.await.into(), self.callback, self.error)
+      let response = match task.await {
+        Ok(ok) => InvokeResponse::Ok(ok),
+        Err(err) => InvokeResponse::Err(err),
+      };
+      Self::return_result(self.window, response, self.callback, self.error)
     });
   }