From 519005ff4d55a2a9d07a0397242a6af53bafafaa Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 2 Oct 2022 20:22:23 +0200
Subject: [PATCH] - snd_reset cannot be shared.

---
 src/common/audio/sound/s_sound.cpp        | 5 -----
 src/sound/s_doomsound.cpp                 | 5 +++++
 wadsrc/static/zscript/engine/screenjob.zs | 6 ++++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/common/audio/sound/s_sound.cpp b/src/common/audio/sound/s_sound.cpp
index b4a3485c32..3cb91a4461 100644
--- a/src/common/audio/sound/s_sound.cpp
+++ b/src/common/audio/sound/s_sound.cpp
@@ -1854,11 +1854,6 @@ CCMD(snd_status)
 	GSnd->PrintStatus();
 }
 
-CCMD(snd_reset)
-{
-	S_SoundReset();
-}
-
 CCMD(snd_listdrivers)
 {
 	GSnd->PrintDriversList();
diff --git a/src/sound/s_doomsound.cpp b/src/sound/s_doomsound.cpp
index fc0d0d6d8e..c981d145c5 100644
--- a/src/sound/s_doomsound.cpp
+++ b/src/sound/s_doomsound.cpp
@@ -1427,3 +1427,8 @@ CCMD (loopsound)
 	}
 }
 
+CCMD(snd_reset)
+{
+	S_SoundReset();
+}
+
diff --git a/wadsrc/static/zscript/engine/screenjob.zs b/wadsrc/static/zscript/engine/screenjob.zs
index 7981418c06..ded06689d3 100644
--- a/wadsrc/static/zscript/engine/screenjob.zs
+++ b/wadsrc/static/zscript/engine/screenjob.zs
@@ -234,6 +234,12 @@ class MoviePlayerJob : SkippableScreenJob
 		return self;
 	}
 
+	override void Start()
+	{
+		System.StopMusic();
+	}
+
+
 	static ScreenJob CreateWithSoundInfo(String filename, Array<int> soundinfo, int flags, int frametime, int firstframetime = -1, int lastframetime = -1)
 	{
 		let movie = MoviePlayer.Create(filename, soundinfo, flags, frametime, firstframetime, lastframetime);