Fix winit event loop in the triangle example

gfx-rs · Apr 22, 2019 · e70b01c · e70b01c
1 parent f5ad767
commit e70b01c
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/examples/hello_triangle_rust/main.rs b/examples/hello_triangle_rust/main.rs
@@ -60,8 +60,7 @@ fn main() {
     });
 
     use wgpu::winit::{
-        ControlFlow, ElementState, Event, EventsLoop, KeyboardInput, VirtualKeyCode, Window,
-        WindowEvent,
+        ElementState, Event, EventsLoop, KeyboardInput, VirtualKeyCode, Window, WindowEvent,
     };
 
     let mut events_loop = EventsLoop::new();
@@ -81,9 +80,9 @@ fn main() {
             height: size.height.round() as u32,
         },
     );
-
-    events_loop.run_forever(|event| {
-        match event {
+    let mut running = true;
+    while running {
+        events_loop.poll_events(|event| match event {
             Event::WindowEvent { event, .. } => match event {
                 WindowEvent::KeyboardInput {
                     input:
@@ -94,14 +93,14 @@ fn main() {
                         },
                     ..
                 } => match code {
-                    VirtualKeyCode::Escape => return ControlFlow::Break,
+                    VirtualKeyCode::Escape => running = false,
                     _ => {}
                 },
-                WindowEvent::CloseRequested => return ControlFlow::Break,
+                WindowEvent::CloseRequested => running = false,
                 _ => {}
             },
             _ => {}
-        }
+        });
 
         let frame = swap_chain.get_next_texture();
         let mut encoder =
@@ -122,7 +121,5 @@ fn main() {
         }
 
         device.get_queue().submit(&[encoder.finish()]);
-
-        ControlFlow::Continue
-    });
+    }
 }