Merge branch 'eventloop-2.0' of https://github.com/tomaka/winit into eventloop-2.0

This commit is contained in:
Osspial 2019-05-29 21:28:39 -04:00
commit ae63fbdbbb

View file

@ -380,6 +380,7 @@ impl<T> EventLoopRunner<T> {
// deferred. // deferred.
if let RunnerState::DeferredNewEvents(wait_start) = self.runner_state { if let RunnerState::DeferredNewEvents(wait_start) = self.runner_state {
match self.control_flow { match self.control_flow {
ControlFlow::Exit |
ControlFlow::Wait => { ControlFlow::Wait => {
self.call_event_handler( self.call_event_handler(
Event::NewEvents(StartCause::WaitCancelled { Event::NewEvents(StartCause::WaitCancelled {
@ -409,7 +410,6 @@ impl<T> EventLoopRunner<T> {
ControlFlow::Poll => { ControlFlow::Poll => {
self.call_event_handler(Event::NewEvents(StartCause::Poll)) self.call_event_handler(Event::NewEvents(StartCause::Poll))
}, },
ControlFlow::Exit => unreachable!()
} }
} }