From ecf42b97df85df25b1b825f37adfeb00f658f6ee Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Thu, 7 Mar 2024 23:25:24 +0100
Subject: Fix `block_on` in `iced_wgpu` hanging Wasm builds

---
 winit/src/application.rs  | 4 ++--
 winit/src/multi_window.rs | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'winit/src')

diff --git a/winit/src/application.rs b/winit/src/application.rs
index 05a4f070..29ee1a71 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -97,7 +97,7 @@ where
 
 /// Runs an [`Application`] with an executor, compositor, and the provided
 /// settings.
-pub fn run<A, E, C>(
+pub async fn run<A, E, C>(
     settings: Settings<A::Flags>,
     compositor_settings: C::Settings,
 ) -> Result<(), Error>
@@ -188,7 +188,7 @@ where
         };
     }
 
-    let compositor = C::new(compositor_settings, window.clone())?;
+    let compositor = C::new(compositor_settings, window.clone()).await?;
     let mut renderer = compositor.create_renderer();
 
     for font in settings.fonts {
diff --git a/winit/src/multi_window.rs b/winit/src/multi_window.rs
index 03066d6c..49d4b8e8 100644
--- a/winit/src/multi_window.rs
+++ b/winit/src/multi_window.rs
@@ -12,7 +12,9 @@ use crate::core::widget::operation;
 use crate::core::window;
 use crate::core::{Point, Size};
 use crate::futures::futures::channel::mpsc;
-use crate::futures::futures::{task, Future, StreamExt};
+use crate::futures::futures::executor;
+use crate::futures::futures::task;
+use crate::futures::futures::{Future, StreamExt};
 use crate::futures::{Executor, Runtime, Subscription};
 use crate::graphics::{compositor, Compositor};
 use crate::multi_window::window_manager::WindowManager;
@@ -183,7 +185,8 @@ where
         };
     }
 
-    let mut compositor = C::new(compositor_settings, main_window.clone())?;
+    let mut compositor =
+        executor::block_on(C::new(compositor_settings, main_window.clone()))?;
 
     let mut window_manager = WindowManager::new();
     let _ = window_manager.insert(
-- 
cgit