From c7503a492d2f0caa8d258bca1db77d3b7635ace7 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 4 Apr 2024 21:36:51 +0100
Subject: [PATCH] Simpler solution to #1225: If a retry flag occurs in a demo,
 stop playback immediately!

---
 src/g_game.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index fa2ca0839..c6a75d9f1 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1791,11 +1791,17 @@ void G_Ticker(boolean run)
 
 	P_MapStart();
 
-	if (gamestate == GS_LEVEL)
+	if (gamestate == GS_LEVEL && G_GetRetryFlag())
 	{
-		// Or, alternatively, retry.
-		if (G_GetRetryFlag())
+		if (demo.playback == true)
 		{
+			// Stop playback!!
+			G_ClearRetryFlag();
+			G_CheckDemoStatus();
+		}
+		else
+		{
+			// Or, alternatively, retry.
 			for (i = 0; i < MAXPLAYERS; i++)
 			{
 				if (playeringame[i])