Apply suggestions from code review

Co-authored-by: Lucas Fernandes Nogueira <[email protected]>
tauri-apps · Oct 21, 2024 · 896482f · 896482f
1 parent f660e20
commit 896482f
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/webkitgtk/mod.rs b/src/webkitgtk/mod.rs
@@ -866,9 +866,13 @@ impl InnerWebView {
         })
       });
 
-    gtk::main_iteration();
+    loop {
+      gtk::main_iteration();
 
-    rx.recv()?.map_err(Into::into)
+      if let Ok(response) = rx.try_recv() {
+        return response.map_err(Into::into);
+      }
+    }
   }
 
   pub fn cookies(&self) -> Result<Vec<cookie::Cookie<'static>>> {
@@ -889,9 +893,13 @@ impl InnerWebView {
         })
       });
 
-    gtk::main_iteration();
+    loop {
+      gtk::main_iteration();
 
-    rx.recv()?.map_err(Into::into)
+      if let Ok(response) = rx.try_recv() {
+        return response.map_err(Into::into);
+      }
+    }
   }
 
   pub fn reparent<W>(&self, container: &W) -> Result<()>