From: DeaDDooMER <deaddoomer@deadsoftware.ru>
Date: Sun, 4 Aug 2019 14:38:50 +0000 (+0300)
Subject: disable binds in menu
X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=commitdiff_plain;h=2f4ef61a594006d1da7ec293ab72502d5d6ba241

disable binds in menu
---

diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 1117032..63454eb 100644
--- 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;