1 files changed, 23 insertions, 2 deletions

diff --git a/src/lib/ecore_cocoa/ecore_cocoa_app.m b/src/lib/ecore_cocoa/ecore_cocoa_app.m
index 04391f61ff..8df1be1830 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa_app.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa_app.m
@@ -112,6 +112,16 @@ _ecore_cocoa_run_loop_cb(void *data EINA_UNUSED)
    ecore_timer_thaw(_timer);
 }
 
+- (void)setTerminateCb:(Ecore_Cocoa_Terminate_Cb)cb
+{
+   _terminate_cb = cb;
+}
+
+- (Ecore_Cocoa_Terminate_Cb)terminateCb
+{
+   return _terminate_cb;
+}
+
 @end
 
 
@@ -131,8 +141,19 @@ static Ecore_Cocoa_AppDelegate *_appDelegate = nil;
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *) EINA_UNUSED sender
 {
    // XXX This should be alterable (by Elm_Window policy)
-   return YES;
+   return NO;
 }
 
-@end
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
+{
+   NSApplicationTerminateReply status = NSTerminateNow;
+   const Ecore_Cocoa_Terminate_Cb cb = [(Ecore_Cocoa_Application *)sender terminateCb];
+   if (cb)
+     {
+         const Eina_Bool ret = cb(sender);
+         if (!ret) status = NSTerminateCancel;
+     }
+   return status;
+}
 
+@end