me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix Compositor concurrent initialization

Browse source 
It seems that initializing the compositor in a
different thread can cause issues in some environments.
This commit is contained in:
Héctor Ramón Jiménez 2025-04-02 20:33:22 +02:00
parent d203392c9d
commit 1b22d7d5fc
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
8 changed files with 37 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
winit/src/program.rs
View file

@ -18,7 +18,7 @@ use crate::futures::futures::channel::oneshot;
use crate::futures::futures::task;
use crate::futures::futures::{Future, StreamExt};
use crate::futures::subscription::{self, Subscription};
use crate::futures::{Executor, MaybeSend, Runtime};
use crate::futures::{Executor, Runtime};
use crate::graphics;
use crate::graphics::{Compositor, compositor};
use crate::runtime::Debug;
@ -149,7 +149,7 @@ pub fn run<P, C>(
) -> Result<(), Error>
where
P: Program + 'static,
C: Compositor<Renderer = P::Renderer> + MaybeSend + 'static,
C: Compositor<Renderer = P::Renderer> + 'static,
P::Theme: theme::Base,
{
use winit::event_loop::EventLoop;
@ -560,7 +560,7 @@ async fn run_instance<P, C>(
default_fonts: Vec<Cow<'static, [u8]>>,
) where
P: Program + 'static,
C: Compositor<Renderer = P::Renderer> + MaybeSend + 'static,
C: Compositor<Renderer = P::Renderer> + 'static,
P::Theme: theme::Base,
{
use winit::event;
@ -636,7 +636,11 @@ async fn run_instance<P, C>(
}
};
runtime.spawn(create_compositor);
#[cfg(target_arch = "wasm32")]
wasm_bindgen_futures::spawn_local(create_compositor);
#[cfg(not(target_arch = "wasm32"))]
runtime.block_on(create_compositor);
match compositor_receiver
.await
@ -648,7 +652,7 @@ async fn run_instance<P, C>(
Err(error) => {
let _ = control_sender
.start_send(Control::Crash(error.into()));
break;
continue;
}
}
}