From 8c10dc406aaf76742cf47a038a80485cb0086189 Mon Sep 17 00:00:00 2001 From: Stuart McHattie Date: Fri, 24 Jul 2020 19:57:05 +0100 Subject: [PATCH] Prevent Mac's Cmd+Q from exiting the game This operation can be devastating if you were trying to assign a control group using Cmd + 1 but accidentally catch the Q key during gameplay. --- OpenRA.Platforms.Default/Sdl2Input.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenRA.Platforms.Default/Sdl2Input.cs b/OpenRA.Platforms.Default/Sdl2Input.cs index 656df74f10..15b684f4ec 100644 --- a/OpenRA.Platforms.Default/Sdl2Input.cs +++ b/OpenRA.Platforms.Default/Sdl2Input.cs @@ -73,7 +73,10 @@ namespace OpenRA.Platforms.Default switch (e.type) { case SDL.SDL_EventType.SDL_QUIT: - Game.Exit(); + // On macOS, we'd like to restrict Cmd + Q from suddenly exiting the game. + if (Platform.CurrentPlatform != PlatformType.OSX || !mods.HasModifier(Modifiers.Meta)) + Game.Exit(); + break; case SDL.SDL_EventType.SDL_WINDOWEVENT: