From c8aeca8acecba157518bb1e8dad35f22e85e620f Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Tue, 25 Oct 2022 00:27:40 -0500 Subject: [PATCH] Add an environment variable opt-out for the gamepad quit combo See #870 --- app/streaming/input/gamepad.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/streaming/input/gamepad.cpp b/app/streaming/input/gamepad.cpp index b15ccfcf..b3b474e5 100644 --- a/app/streaming/input/gamepad.cpp +++ b/app/streaming/input/gamepad.cpp @@ -259,7 +259,7 @@ void SdlInputHandler::handleControllerButtonEvent(SDL_ControllerButtonEvent* eve } // Handle Start+Select+L1+R1 as a gamepad quit combo - if (state->buttons == (PLAY_FLAG | BACK_FLAG | LB_FLAG | RB_FLAG)) { + if (state->buttons == (PLAY_FLAG | BACK_FLAG | LB_FLAG | RB_FLAG) && qgetenv("NO_GAMEPAD_QUIT") != "1") { SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Detected quit gamepad button combo");