Consume input event in QuitDialog instead of relying on a hack

2 files changed, 12 insertions, 15 deletions

diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp
index d1ceb1ad9..7ef2bc6e8 100644
--- a/src/gui/windows/quitdialog.cpp
+++ b/src/gui/windows/quitdialog.cpp
@@ -210,6 +210,7 @@ void QuitDialog::keyPressed(KeyEvent &event)
 {
     const InputActionT actionId = event.getActionId();
     int dir = 0;
+    bool consume = true;
 
     PRAGMA45(GCC diagnostic push)
     PRAGMA45(GCC diagnostic ignored "-Wswitch-enum")
@@ -229,10 +230,14 @@ void QuitDialog::keyPressed(KeyEvent &event)
             dir = 1;
             break;
         default:
+            consume = false;
             break;
     }
     PRAGMA45(GCC diagnostic pop)
 
+    if (consume)
+        event.consume();
+
     if (dir != 0)
     {
         STD_VECTOR<RadioButton*>::const_iterator it = mOptions.begin();
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index fc2815b5e..8cb10041e 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -691,21 +691,7 @@ bool InputManager::handleEvent(const SDL_Event &restrict event) restrict2
                 BLOCK_END("InputManager::handleEvent")
                 return true;
             }
-
             keyboard.handleActivateKey(event);
-            // send straight to gui for certain windows
-#ifndef DYECMD
-            if ((quitDialog != nullptr) || TextDialog::isActive())
-            {
-                if (guiInput != nullptr)
-                    guiInput->pushInput(event);
-                if (gui != nullptr)
-                    gui->handleInput();
-                BLOCK_END("InputManager::handleEvent")
-                return true;
-            }
-#endif  // DYECMD
-
             break;
         }
         case SDL_KEYUP:
@@ -767,9 +753,15 @@ bool InputManager::handleEvent(const SDL_Event &restrict event) restrict2
         guiInput->pushInput(event);
     if (gui != nullptr)
     {
-        const bool res = gui->handleInput();
+        bool res = gui->handleInput();
+#ifndef DYECMD
+        // always treat keyboard input as handled if a text dialog is active
+        if (event.type == SDL_KEYDOWN && TextDialog::isActive())
+            res = true;
+#endif  // DYECMD
         const bool joystickActionEvent =
             joystick != nullptr && joystick->isActionEvent(event);
+        // stop processing input if event is consumed by the gui
         if (res && (event.type == SDL_KEYDOWN || joystickActionEvent))
         {
             BLOCK_END("InputManager::handleEvent")