Fix infinite runtime loop when queue redraws at a specific time

iced-rs · Feb 2, 2025 · 57b553d · 57b553d
1 parent e73d0c6
commit 57b553d
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 40 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/winit/src/program.rs b/winit/src/program.rs
@@ -737,6 +737,17 @@ async fn run_instance<P, C>(
                                 }
                             }
                         }
+
+                        if let Some(redraw_at) = window_manager.redraw_at() {
+                            let _ =
+                                control_sender.start_send(Control::ChangeFlow(
+                                    ControlFlow::WaitUntil(redraw_at),
+                                ));
+                        } else {
+                            let _ = control_sender.start_send(
+                                Control::ChangeFlow(ControlFlow::Wait),
+                            );
+                        }
                     }
                     event::Event::PlatformSpecific(
                         event::PlatformSpecific::MacOS(
@@ -868,6 +879,7 @@ async fn run_instance<P, C>(
                             match redraw_request {
                                 window::RedrawRequest::NextFrame => {
                                     window.raw.request_redraw();
+                                    window.redraw_at = None;
                                 }
                                 window::RedrawRequest::At(at) => {
                                     window.redraw_at = Some(at);
@@ -1028,6 +1040,7 @@ async fn run_instance<P, C>(
                                 } => match redraw_request {
                                     window::RedrawRequest::NextFrame => {
                                         window.raw.request_redraw();
+                                        window.redraw_at = None;
                                     }
                                     window::RedrawRequest::At(at) => {
                                         window.redraw_at = Some(at);