Fix opening automap

bradharding · Oct 25, 2024 · 9e39c0f · 9e39c0f
1 parent 86345a5
commit 9e39c0f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/am_map.c b/src/am_map.c
@@ -671,9 +671,9 @@ bool AM_Responder(const event_t *ev)
         {
             if ((ev->type == ev_keydown
                 && (ev->data1 == keyboardautomap
-                    || ev->data1 == keyboardautomap2)
+                    || (keyboardautomap2 && ev->data1 == keyboardautomap2))
                 && keydown != keyboardautomap
-                && keydown != keyboardautomap2
+                && (!keyboardautomap2 || keydown != keyboardautomap2)
                 && !(modstate & KMOD_ALT))
                 || (ev->type == ev_mouse
                     && mouseautomap >= 0
@@ -801,8 +801,8 @@ bool AM_Responder(const event_t *ev)
                 }
 
                 // leave automap
-                else if ((key == keyboardautomap || key == keyboardautomap2) && !(modstate & KMOD_ALT)
-                    && keydown != keyboardautomap && keydown != keyboardautomap2 && !mapwindow)
+                else if ((key == keyboardautomap || (keyboardautomap2 && key == keyboardautomap2)) && !(modstate & KMOD_ALT)
+                    && keydown != keyboardautomap && (!keyboardautomap2 || keydown != keyboardautomap2) && !mapwindow)
                 {
                     keydown = key;
                     viewactive = true;