leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: close subscriptions when exiting

Browse source
This commit is contained in:
Ashley Wulber 2024-11-13 17:53:17 -05:00
parent 44ac127e8d
commit 3cb4e4674e
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
winit/src/lib.rs
View file

@ -931,7 +931,7 @@ async fn run_instance<P>(
} }
} }
Event::UserEvent(action) => { Event::UserEvent(action) => {
run_action( let exited = run_action(
action, action,
&program, &program,
&mut runtime, &mut runtime,
@ -947,6 +947,9 @@ async fn run_instance<P>(
&mut system_theme, &mut system_theme,
&mut platform_specific_handler, &mut platform_specific_handler,
); );
if exited {
runtime.track(None.into_iter());
}
actions += 1; actions += 1;
} }
Event::Winit(window_id, event::WindowEvent::RedrawRequested) => { Event::Winit(window_id, event::WindowEvent::RedrawRequested) => {
@ -1058,7 +1061,7 @@ async fn run_instance<P>(
continue; continue;
} }
run_action( _ = run_action(
action, action,
&program, &program,
&mut runtime, &mut runtime,
@ -1212,6 +1215,7 @@ async fn run_instance<P>(
&& !is_window_opening && !is_window_opening
&& window_manager.is_empty() && window_manager.is_empty()
{ {
runtime.track(None.into_iter());
control_sender control_sender
.start_send(Control::Exit) .start_send(Control::Exit)
.expect("Send control action"); .expect("Send control action");
@ -1246,7 +1250,7 @@ async fn run_instance<P>(
if matches!(event, winit::event::WindowEvent::CloseRequested) if matches!(event, winit::event::WindowEvent::CloseRequested)
&& window.exit_on_close_request && window.exit_on_close_request
{ {
run_action( _ = run_action(
Action::Window(runtime::window::Action::Close(id)), Action::Window(runtime::window::Action::Close(id)),
&program, &program,
&mut runtime, &mut runtime,
@ -1385,7 +1389,7 @@ async fn run_instance<P>(
)); ));
for action in actions { for action in actions {
run_action( let exited = run_action(
action, action,
&program, &program,
&mut runtime, &mut runtime,
@ -1401,6 +1405,9 @@ async fn run_instance<P>(
&mut system_theme, &mut system_theme,
&mut platform_specific_handler, &mut platform_specific_handler,
); );
if exited {
runtime.track(None.into_iter());
}
} }
for (_id, window) in window_manager.iter_mut() { for (_id, window) in window_manager.iter_mut() {
@ -1601,7 +1608,8 @@ fn run_action<'a, P, C>(
is_window_opening: &mut bool, is_window_opening: &mut bool,
system_theme: &mut theme::Mode, system_theme: &mut theme::Mode,
platform_specific: &mut crate::platform_specific::PlatformSpecific, platform_specific: &mut crate::platform_specific::PlatformSpecific,
) where ) -> bool
where
P: Program, P: Program,
C: Compositor<Renderer = P::Renderer> + 'static, C: Compositor<Renderer = P::Renderer> + 'static,
P::Theme: theme::Base, P::Theme: theme::Base,
@ -1999,7 +2007,7 @@ fn run_action<'a, P, C>(
} }
let Some(theme) = conversion::window_theme(mode) else { let Some(theme) = conversion::window_theme(mode) else {
return; return false;
}; };
for (_id, window) in window_manager.iter_mut() { for (_id, window) in window_manager.iter_mut() {
@ -2083,6 +2091,7 @@ fn run_action<'a, P, C>(
control_sender control_sender
.start_send(Control::Exit) .start_send(Control::Exit)
.expect("Send control action"); .expect("Send control action");
return true;
} }
Action::Dnd(a) => match a { Action::Dnd(a) => match a {
iced_runtime::dnd::DndAction::RegisterDndDestination { iced_runtime::dnd::DndAction::RegisterDndDestination {
@ -2115,6 +2124,7 @@ fn run_action<'a, P, C>(
platform_specific.send_action(a); platform_specific.send_action(a);
} }
} }
false
} }
/// Build the user interface for every window. /// Build the user interface for every window.