[[ Bug 16288 ]] Shutdown from menu gracefully to avoid out-of-sequence call to MCDeletedObjectsTeardown()

livecodeian · livecodeian · commit a3f5c05a5ee5 · 2015-11-13T15:01:52.000Z
diff --git a/engine/src/mac-menu.mm b/engine/src/mac-menu.mm
@@ -325,9 +325,10 @@ - (void)quitMenuItemSelected: (id)sender
 //  so we quit!
 - (void)quitApplicationSelected: (id)sender
 {
-    NSApplication* t_app = [NSApplication sharedApplication];
-    
-    [t_app terminate:t_app];
+	// IM-2015-11-13: [[ Bug 16288 ]] Send shutdown request rather than terminating immediately
+	//    to allow shutdown in orderly fashion.
+	bool t_shutdown;
+	MCPlatformCallbackSendApplicationShutdownRequest(t_shutdown);
 }
 
 // SN-2014-11-10: [[ Bug 13836 ]] The menubar should be updated if left item is clicked

Original file line number	Diff line number	Diff line change
`@@ -325,9 +325,10 @@ - (void)quitMenuItemSelected: (id)sender`
`325`	`325`	`// so we quit!`
`326`	`326`	`- (void)quitApplicationSelected: (id)sender`
`327`	`327`	`{`
`328`		`- NSApplication* t_app = [NSApplication sharedApplication];`
`329`		`-`
`330`		`- [t_app terminate:t_app];`
	`328`	`+ // IM-2015-11-13: [[ Bug 16288 ]] Send shutdown request rather than terminating immediately`
	`329`	`+ // to allow shutdown in orderly fashion.`
	`330`	`+ bool t_shutdown;`
	`331`	`+ MCPlatformCallbackSendApplicationShutdownRequest(t_shutdown);`
`331`	`332`	`}`
`332`	`333`
`333`	`334`	`// SN-2014-11-10: [[ Bug 13836 ]] The menubar should be updated if left item is clicked`