From c03311fa2d2bb4d80d0029db17725102ab85d51c Mon Sep 17 00:00:00 2001
From: mitchmindtree <mitchell.nordine@gmail.com>
Date: Sat, 4 Feb 2017 13:30:34 +1100
Subject: [PATCH] Add a method to simplify emitting an event from the macos
 poll_events and run_forever methods

---
 src/platform/macos/events_loop.rs | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/platform/macos/events_loop.rs b/src/platform/macos/events_loop.rs
index b9fbbba2..59796d52 100644
--- a/src/platform/macos/events_loop.rs
+++ b/src/platform/macos/events_loop.rs
@@ -58,9 +58,7 @@ impl EventsLoop {
         loop {
             // First, yield all pending events.
             while let Some(event) = self.pending_events.lock().unwrap().pop_front() {
-                if let Ok(mut callback) = self.callback.lock() {
-                    callback.as_mut().unwrap()(event);
-                }
+                self.emit_event(event);
             }
 
             unsafe {
@@ -79,9 +77,7 @@ impl EventsLoop {
 
                 match event {
                     // Call the user's callback.
-                    Some(event) => if let Ok(mut callback) = self.callback.lock() {
-                        callback.as_mut().unwrap()(event);
-                    },
+                    Some(event) => self.emit_event(event),
                     None => break,
                 }
             }
@@ -108,9 +104,7 @@ impl EventsLoop {
         loop {
             // First, yield all pending events.
             while let Some(event) = self.pending_events.lock().unwrap().pop_front() {
-                if let Ok(mut callback) = self.callback.lock() {
-                    callback.as_mut().unwrap()(event);
-                }
+                self.emit_event(event);
             }
 
             unsafe {
@@ -124,9 +118,7 @@ impl EventsLoop {
                     cocoa::base::YES);
 
                 if let Some(event) = self.ns_event_to_event(ns_event) {
-                    if let Ok(mut callback) = self.callback.lock() {
-                        callback.as_mut().unwrap()(event);
-                    }
+                    self.emit_event(event);
                 }
 
                 let _: () = msg_send![pool, release];
@@ -183,6 +175,13 @@ impl EventsLoop {
         *self.callback.lock().unwrap() = Some(boxed);
     }
 
+    // Emits the given event via the user-given callback.
+    fn emit_event(&self, event: Event) {
+        if let Ok(mut callback) = self.callback.lock() {
+            callback.as_mut().unwrap()(event);
+        }
+    }
+
     // Convert some given `NSEvent` into a winit `Event`.
     unsafe fn ns_event_to_event(&self, ns_event: cocoa::base::id) -> Option<Event> {
         if ns_event == cocoa::base::nil {