Merge branch 'bugfix-13510' into develop

runrevmark · runrevmark · commit 5164160f59bf · 2014-10-09T10:51:28.000+01:00
diff --git a/docs/notes/bugfix-13510.md b/docs/notes/bugfix-13510.md
@@ -0,0 +1 @@
+# Shutdownrequest message being sent twice when triggered from a quit in menu
diff --git a/engine/src/mac-menu.mm b/engine/src/mac-menu.mm
@@ -319,7 +319,14 @@ - (BOOL)performKeyEquivalent: (NSEvent *)event
 	// Otherwise, we lock menuSelect firing, and propagate a keydown/keyup.
 	BOOL t_key_equiv;
 	MCMacPlatformLockMenuSelect();
-	t_key_equiv = [super performKeyEquivalent: event];
+    
+    // SN-2014-09-30: [[ Bug 13510 ]] We don't want to fire the Cmd+Q key equivalent, which
+    // would call applicationShouldTerminate.
+    if ([[event characters] compare:@"q" options:NSCaseInsensitiveSearch] != NSOrderedSame)
+        t_key_equiv = [super performKeyEquivalent: event];
+    else
+        t_key_equiv = YES;
+    
 	MCMacPlatformUnlockMenuSelect();
 	
     BOOL t_force_keypress;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Shutdownrequest message being sent twice when triggered from a quit in menu`