From 5a802219cec28ca7d8ce02929bcf3e39fc3b4402 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 30 Mar 2023 01:11:22 +0100
Subject: [PATCH] M_SoundTestNextPrev: Set cv_soundtest to 0 when returning to
 the soundtest entry

---
 src/menus/transient/sound-test.c | 1 +
 src/s_sound.c                    | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/src/menus/transient/sound-test.c b/src/menus/transient/sound-test.c
index b33514e4e..68ca08304 100644
--- a/src/menus/transient/sound-test.c
+++ b/src/menus/transient/sound-test.c
@@ -63,6 +63,7 @@ static void M_SoundTestMainControl(INT32 choice)
 	{
 		soundtest.current = NULL;
 		soundtest.currenttrack = 0;
+		CV_SetValue(&cv_soundtest, 0);
 	}
 }
 
diff --git a/src/s_sound.c b/src/s_sound.c
index cc7ec287d..5c92622da 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -1582,6 +1582,11 @@ updatecurrent:
 			? newdef->numtracks-1
 			: 0;
 
+	if (newdef == NULL)
+	{
+		CV_SetValue(&cv_soundtest, 0);
+	}
+
 updatetrackonly:
 	if (soundtest.playing == true)
 	{