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

Allow Application::run to return on native platforms

Browse source
This commit is contained in:
Andreas Hofstadler 2021-11-07 14:32:18 +01:00 • committed by Héctor Ramón Jiménez
parent aeec0375f0
commit 08c771fa70
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
3 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
winit/src/application.rs
View file

@ -17,6 +17,7 @@ use iced_graphics::window;
use iced_native::program::Program;
use iced_native::{Cache, UserInterface};
use crate::winit::platform::run_return::EventLoopExtRunReturn;
use std::mem::ManuallyDrop;
/// An interactive, native cross-platform application.
@ -119,7 +120,7 @@ where
let mut debug = Debug::new();
debug.startup_started();
let event_loop = EventLoop::with_user_event();
let mut event_loop = EventLoop::with_user_event();
let mut proxy = event_loop.create_proxy();
let mut runtime = {
@ -178,7 +179,7 @@ where
let mut context = task::Context::from_waker(task::noop_waker_ref());
event_loop.run(move |event, _, control_flow| {
event_loop.run_return(move |event, _, control_flow| {
use winit::event_loop::ControlFlow;
if let ControlFlow::Exit = control_flow {
@ -211,6 +212,8 @@ where
};
}
});
Ok(())
}
async fn run_instance<A, E, C>(
@ -401,7 +404,7 @@ async fn run_instance<A, E, C>(
Err(error) => match error {
// This is an unrecoverable error.
window::SurfaceError::OutOfMemory => {
panic!("{}", error);
panic!("{:?}", error);
}
_ => {
debug.render_finished();