From fe26098c2b8e4499d5458551a15fca24636cc05a Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sat, 6 Apr 2019 15:22:14 -0700 Subject: [PATCH] Fix quitting via Command-Q on macOS --- app/gui/sdlgamepadkeynavigation.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/gui/sdlgamepadkeynavigation.cpp b/app/gui/sdlgamepadkeynavigation.cpp index a06b3f46..76c13cd8 100644 --- a/app/gui/sdlgamepadkeynavigation.cpp +++ b/app/gui/sdlgamepadkeynavigation.cpp @@ -91,6 +91,12 @@ void SdlGamepadKeyNavigation::onPollingTimerFired() while (SDL_PollEvent(&event)) { switch (event.type) { + case SDL_QUIT: + // SDL may send us a quit event since we initialize + // the video subsystem on startup. If we get one, + // forward it on for Qt to take care of. + QCoreApplication::instance()->quit(); + break; case SDL_CONTROLLERBUTTONDOWN: case SDL_CONTROLLERBUTTONUP: {