Now CMD+Q works everywhere

src/OpenRaider.cpp

@@ -675,7 +675,6 @@ void OpenRaider::handleKeyPressEvent(unsigned int key, unsigned int mod)
 {
 	static bool menu = false;
 
-
 	// Cheap menu test
 	if (menu)
 	{
@@ -744,15 +743,6 @@ void OpenRaider::handleKeyPressEvent(unsigned int key, unsigned int mod)
 			toggleFullscreen();
 		}
 		break;
-
-#ifdef __APPLE__
-    // Handle CMD+Q to quit
-    case 'q':
-        if (mod & SYS_MOD_KEY_LMETA) {
-            shutdown(0);
-        }
-        break;
-#endif
 	}
 
 	////////////////////////////////////////////////////////////

src/SDLSystem.cpp

@@ -484,6 +484,15 @@ void SDLSystem::runGame()
 					break;
 				}
 
+#ifdef __APPLE__
+                // Handle CMD+Q to quit in all circumstances
+                if (key == 'q') {
+                    if (mod & SYS_MOD_KEY_LMETA) {
+                        shutdown(0);
+                    }
+                }
+#endif
+
 #ifdef UNICODE_SUPPORT
 				// JML: if a std key was pressed get it ascii code
 				if (!specialKey && key != 0)