disable binds in menu

[d2df-sdl.git] / src / game / g_console.pas

diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 11170326ca66b02c8f09a200297df5e7e6263e86..63454eb1cb52dbf1ad6b6014a971926559679f5b 100644 (file)
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
@@ -1721,13 +1721,13 @@ begin
       Result := g_Console_MatchBind(key, 'togglemenu') or
                 g_Console_MatchBind(key, 'showkeyboard') or
                 g_Console_MatchBind(key, 'hidekeyboard')
-    else if (gGameSettings.GameType <> GT_NONE) and not gConsoleShow then
-      Result := True
-    else (* if CONSOLE or MENU then *)
+    else if gConsoleShow or (g_ActiveWindow <> nil) or (gGameSettings.GameType = GT_NONE) then
       Result := g_Console_MatchBind(key, 'togglemenu') or
                 g_Console_MatchBind(key, 'toggleconsole') or
                 g_Console_MatchBind(key, 'showkeyboard') or
                 g_Console_MatchBind(key, 'hidekeyboard')
+    else (* in game *)
+      Result := True
   end
 end;