From dcd0fe7feb4ae94695a5df782e009cb231c6f0cf Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Wed, 1 May 2024 18:08:36 +0100
Subject: [PATCH] G_SaveDemo: Defer save for eversavedreplay event

Prevents challenge success noise from being eaten by gamestate transition
---
 src/g_demo.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/g_demo.cpp b/src/g_demo.cpp
index 4e0bfd437..bb6aff69b 100644
--- a/src/g_demo.cpp
+++ b/src/g_demo.cpp
@@ -4174,8 +4174,11 @@ void G_SaveDemo(void)
 			if (gamedata->eversavedreplay == false)
 			{
 				gamedata->eversavedreplay = true;
-				M_UpdateUnlockablesAndExtraEmblems(true, true);
-				G_SaveGameData();
+				// The following will IMMEDIATELY happen on either next level load
+				// or returning to menu, so don't make the sound just to get cut off
+				//M_UpdateUnlockablesAndExtraEmblems(true, true);
+				//G_SaveGameData();
+				gamedata->deferredsave = true;
 			}
 		}
 		else