From 59830a4ff00876ee01c7cb2d8769d7b6c28db25c Mon Sep 17 00:00:00 2001
From: zander3312 <zanderh3312@gmail.com>
Date: Sun, 26 Oct 2025 00:06:26 +0000
Subject: [PATCH] Fix softlocks surrounding chat input changes

---
 src/k_menufunc.c                 | 2 +-
 src/menus/transient/pause-game.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index 6c08e6c4c..812c7f80e 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -1098,7 +1098,7 @@ void M_UpdateMenuCMD(UINT8 i, boolean bailrequired, boolean chat_open)
 	menucmd[i].buttons = 0;
 
 	// Eat inputs made when chat is open
-	if (chat_open)
+	if (chat_open && pausemenu.closing)
 		return;
 
 	if (G_PlayerInputDown(i, gc_screenshot,    mp)) { menucmd[i].buttons |= MBT_SCREENSHOT; }
diff --git a/src/menus/transient/pause-game.c b/src/menus/transient/pause-game.c
index 5f2f9a006..8ccd26b95 100644
--- a/src/menus/transient/pause-game.c
+++ b/src/menus/transient/pause-game.c
@@ -15,6 +15,7 @@
 #include "../../d_netcmd.h"
 #include "../../i_time.h"
 #include "../../k_menu.h"
+#include "../../hu_stuff.h"
 #include "../../k_grandprix.h" // K_CanChangeRules
 #include "../../m_cond.h"
 #include "../../s_sound.h"
@@ -125,6 +126,9 @@ void M_OpenPauseMenu(void)
 	pausemenu.openoffset.dist = 0;
 	pausemenu.closing = false;
 
+	// Fix specific input error regarding closing netgame chat with escape while a controller is connected (only on Windows?)
+	chat_keydown = false;
+
 	itemOn = currentMenu->lastOn = mpause_continue;	// Make sure we select "RESUME GAME" by default
 
 	// Now the hilarious balancing act of deciding what options should be enabled and which ones shouldn't be!