From 76ab7d3886c5a5e7c777e3cd9869e7b428247c06 Mon Sep 17 00:00:00 2001
From: marcelofg55 <marcelofg55@gmail.com>
Date: Sat, 4 Jun 2016 12:35:00 -0300
Subject: [PATCH] Right click->Quit on the godot icon will now close the
 application on OSX. Fixed get_window_position that missed a return on OSX.

---
 platform/osx/os_osx.mm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index 1d97ffacb68..b5503fcd735 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -139,12 +139,10 @@ static int button_mask=0;
 
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {
-/*    _Godotwindow* window;
+	if (OS_OSX::singleton->get_main_loop())
+		OS_OSX::singleton->get_main_loop()->notification(MainLoop::NOTIFICATION_WM_QUIT_REQUEST);
 
-    for (window = _Godot.windowListHead;  window;  window = window->next)
-	_GodotInputWindowCloseRequest(window);
-*/
-    return NSTerminateCancel;
+	return NSTerminateCancel;
 }
 
 - (void)applicationDidHide:(NSNotification *)notification
@@ -1463,6 +1461,7 @@ Point2 OS_OSX::get_window_position() const {
 
 	Size2 wp([window_object frame].origin.x, [window_object frame].origin.y);
 	wp*=display_scale;
+	return wp;
 };