1 files changed, 11 insertions, 0 deletions
diff --git a/src/heretic/mn_menu.c b/src/heretic/mn_menu.c
index 3057261f..a72f2455 100644
--- a/src/heretic/mn_menu.c
+++ b/src/heretic/mn_menu.c
@@ -1080,6 +1080,17 @@ boolean MN_Responder(event_t * event)
         return true;
     }
 
+    // Allow the menu to be activated from a joystick button if a button
+    // is bound for joybmenu.
+    if (event->type == ev_joystick)
+    {
+        if (joybmenu >= 0 && (event->data1 & (1 << joybmenu)) != 0)
+        {
+            MN_ActivateMenu();
+            return true;
+        }
+    }
+
     if (event->type != ev_keydown)
     {
         return false;