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

Panic instead of erroring when compositor channel unexpectedly closes

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2025-01-14 11:16:03 +00:00
parent 2086fc0d6b
commit 8b3b554de2
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
1 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
winit/src/program.rs
View file

@ -586,13 +586,13 @@ async fn run_instance<P, C>(
let compositor_receiver = let compositor_receiver =
compositor_receiver.take().expect("Waiting for compositor"); compositor_receiver.take().expect("Waiting for compositor");
match compositor_receiver.await.ok() { match compositor_receiver.await {
Some(Ok((new_compositor, event))) => { Ok(Ok((new_compositor, event))) => {
compositor = Some(new_compositor); compositor = Some(new_compositor);
Some(event) Some(event)
} }
Some(Err(error)) => { Ok(Err(error)) => {
control_sender control_sender
.start_send(Control::Crash( .start_send(Control::Crash(
Error::GraphicsCreationFailed(error), Error::GraphicsCreationFailed(error),
@ -600,15 +600,8 @@ async fn run_instance<P, C>(
.expect("Send control action"); .expect("Send control action");
break; break;
} }
None => { Err(error) => {
control_sender panic!("Compositor initialization failed: {error}")
.start_send(Control::Crash(
Error::GraphicsCreationFailed(
graphics::Error::NoAvailablePixelFormat,
),
))
.expect("Send control action");
break;
} }
} }
// Empty the queue if possible // Empty the queue if possible