Merge pull request #318 from glennw/thread-wake-mac

Fix waking up mac event loop from thread.
This commit is contained in:
tomaka
2015-03-23 10:35:31 +01:00

View File

@@ -30,7 +30,7 @@ use std::str::from_utf8;
use std::sync::Mutex;
use std::ascii::AsciiExt;
use events::Event::{MouseInput, MouseMoved, ReceivedCharacter, KeyboardInput, MouseWheel};
use events::Event::{Awakened, MouseInput, MouseMoved, ReceivedCharacter, KeyboardInput, MouseWheel};
use events::ElementState::{Pressed, Released};
use events::MouseButton;
use events;
@@ -333,6 +333,8 @@ impl<'a> Iterator for WaitEventsIterator<'a> {
// calling poll_events()
if let Some(ev) = self.window.poll_events().next() {
return Some(ev);
} else {
return Some(Awakened);
}
}
}