From 73c381750a7da105c5723f6e3dfd197ede8001fa Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 28 Aug 2025 19:30:48 +0100
Subject: [PATCH] Instead of trying to carve out an exception for the brief
 window of time after winning but before director begins, just remove the <x>
 input for starting demo title entry

---
 src/g_demo.cpp | 14 ++------------
 src/st_stuff.c |  7 +------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/g_demo.cpp b/src/g_demo.cpp
index 4001d8906..16d6eabdc 100644
--- a/src/g_demo.cpp
+++ b/src/g_demo.cpp
@@ -4316,22 +4316,12 @@ boolean G_CheckDemoTitleEntry(void)
 	if (menuactive || chat_on)
 		return false;
 
-	// Input conflict for both <b> and <x>
+	// Input conflict
 	if (gamestate == GS_LEVEL && camera[0].freecam)
 		return false;
 
 	if (!G_PlayerInputDown(0, gc_b, 0))
-	{
-		// Input conflict for <x>
-		if (gamestate == GS_LEVEL
-		&& playeringame[consoleplayer]
-		&& players[consoleplayer].spectator
-		&& K_DirectorIsEnabled(0))
-			return false;
-
-		if (!G_PlayerInputDown(0, gc_x, 0))
-			return false;
-	}
+		return false;
 
 	demo.willsave = true;
 	M_OpenVirtualKeyboard(
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 128ff58b9..07f17cb3d 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -1510,13 +1510,8 @@ void ST_DrawSaveReplayHint(INT32 flags)
 	}
 	else if (demo.willsave && demo.titlename[0])
 		text = "Replay will be saved.  <b> Change title";
-	else if (gamestate == GS_LEVEL
-	&& playeringame[consoleplayer]
-	&& players[consoleplayer].spectator
-	&& K_DirectorIsEnabled(0))
-		text = "<b> Save replay";
 	else
-		text = "<b> or <x> Save replay";
+		text = "<b> Save replay";
 
 	K_DrawGameControl(BASEVIDWIDTH - 2, 2, 0, text, 2, TINY_FONT, flags|V_YELLOWMAP);
 }