From c341f38ba89c8cf2df2feb255fd666a7a7127af9 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Tue, 8 Aug 2023 17:32:39 -0700
Subject: [PATCH 1/2] srb2::music::TunesManager::resync: don't resync if server
 is not sending updates

Prevents "CD skipping" jumpscare.
---
 src/music_manager.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/music_manager.cpp b/src/music_manager.cpp
index 5d5edf058..05d02d855 100644
--- a/src/music_manager.cpp
+++ b/src/music_manager.cpp
@@ -20,6 +20,7 @@
 #include "music_manager.hpp"
 #include "music_tune.hpp"
 
+#include "d_clisrv.h"
 #include "doomtype.h"
 #include "i_sound.h"
 #include "i_time.h"
@@ -173,6 +174,13 @@ bool TuneManager::resync()
 		return false;
 	}
 
+	if (hu_stopped)
+	{
+		// The server is not sending updates. Don't resync
+		// because we know game logic is not moving anyway.
+		return false;
+	}
+
 	long d_local = I_GetTime() - time_local_;
 	long d_sync = detail::tic_time() - time_sync_;
 

From c6254d29f9655fad20503062d1d34e8dfc0b89a6 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Tue, 8 Aug 2023 17:39:35 -0700
Subject: [PATCH 2/2] Don't restart netgame connection music if it's already
 playing

---
 src/d_clisrv.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 65cc8c64e..eb493d55e 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2750,7 +2750,11 @@ static void Command_connect(void)
 	restoreMenu = &PLAY_MP_OptSelectDef;
 
 	Music_Remap("menu", "NETMD2");
-	Music_Play("menu");
+
+	if (stricmp(Music_CurrentSong(), "NETMD2"))
+	{
+		Music_Play("menu");
+	}
 
 	if (setup_numplayers == 0)
 	{