Ticket #3194: reproduce_bug_worse.patch

source/gui/CGUI.cpp

@@ -73 +73 @@
 
         std::map<CStr, std::vector<IGUIObject*> >::iterator it = m_HotkeyObjects.find(hotkey);
         if (it != m_HotkeyObjects.end())
             for (IGUIObject* const& obj : it->second)
             {
-                // Update hotkey status before sending the event,
-                // else the status will be outdated when processing the GUI event.
-                HotkeyInputHandler(ev);
-                ret = IN_HANDLED;
-
-                if (ev->ev.type == SDL_HOTKEYDOWN)
-                    obj->SendEvent(GUIM_PRESSED, "press");
-                else
-                    obj->SendEvent(GUIM_RELEASED, "release");
+                if ((ev->ev.type == SDL_HOTKEYDOWN && obj->SendEvent(GUIM_PRESSED, "press") == IN_HANDLED) ||
+                    (ev->ev.type == SDL_HOTKEYUP && obj->SendEvent(GUIM_RELEASED, "release") == IN_HANDLED))
+                {
+                    ret = IN_HANDLED;
+                }
             }
     }
 
     else if (ev->ev.type == SDL_MOUSEMOTION)
     {