From cafd3528a47eddae3214aef3c96de619d56a026b Mon Sep 17 00:00:00 2001 From: bjarni Date: Fri, 7 Oct 2005 20:53:21 +0000 Subject: [PATCH] (svn r3027) -Feature: [OSX] command+q now works in main menu (Tobin) --- main_gui.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/main_gui.c b/main_gui.c index a705f707c3..9ccfb5bdd1 100644 --- a/main_gui.c +++ b/main_gui.c @@ -2349,6 +2349,13 @@ static void MainWindowWndProc(Window *w, WindowEvent *e) { e->keypress.cont = false; break; } + + // check to see if Command-Q has been pressed on a Mac + // must be done before checking if we are at the main menu + if ( (e->keypress.keycode == ('Q' | WKC_CTRL)) || (e->keypress.keycode == ('Q' | WKC_META)) ) + { + AskExitGame(); + } if (_game_mode == GM_MENU) break; @@ -2366,7 +2373,6 @@ static void MainWindowWndProc(Window *w, WindowEvent *e) { case WKC_ESC: ResetObjectToPlace(); break; case WKC_DELETE: DeleteNonVitalWindows(); break; case WKC_DELETE | WKC_SHIFT: DeleteAllNonVitalWindows(); break; - case 'Q' | WKC_CTRL: case 'Q' | WKC_META: AskExitGame(); break; // this enables command + Q on mac case 'R' | WKC_CTRL: MarkWholeScreenDirty(); break; #if defined(_DEBUG) case '0' | WKC_ALT: /* Crash the game */