Ticket #3194: cleanup_return_handled_only_if_handled.patch

Index: source/gui/CGUI.cpp
===================================================================
--- source/gui/CGUI.cpp (revision 19040)
+++ source/gui/CGUI.cpp (working copy)
@@ -73,19 +73,15 @@ InReaction CGUI::HandleEvent(const SDL_E

        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)
    {