From cbbd0fd0b7c13c5b21541824d4fb6f23db95d724 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Tue, 5 Oct 2010 19:15:33 +0000
Subject: [PATCH] - fixed: Strife's in-level slideshow had the wrong music. -
 fixed: Sounds played on an intermission page must be stopped when the page is
 destroyed.

SVN r2899 (finale)
---
 src/intermission/intermission.cpp | 3 +++
 wadsrc/static/mapinfo/strife.txt  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/intermission/intermission.cpp b/src/intermission/intermission.cpp
index 2227303d0f..3f9a61f0fa 100644
--- a/src/intermission/intermission.cpp
+++ b/src/intermission/intermission.cpp
@@ -218,6 +218,7 @@ void DIntermissionScreen::Destroy()
 		mPaletteChanged = false;
 		M_EnableMenu(true);
 	}
+	S_StopSound(CHAN_VOICE);
 	Super::Destroy();
 }
 
@@ -740,6 +741,7 @@ void DIntermissionController::Ticker ()
 				wipegamestate = GS_LEVEL;
 				P_ResumeConversation ();
 				viewactive = true;
+				Destroy();
 				break;
 
 			case FSTATE_ChangingLevel:
@@ -765,6 +767,7 @@ void DIntermissionController::Drawer ()
 void DIntermissionController::Destroy ()
 {
 	Super::Destroy();
+	if (mScreen != NULL) mScreen->Destroy();
 	if (mDeleteDesc) delete mDesc;
 	mDesc = NULL;
 	if (CurrentIntermission == this) CurrentIntermission = NULL;
diff --git a/wadsrc/static/mapinfo/strife.txt b/wadsrc/static/mapinfo/strife.txt
index 502ff73658..781e25071d 100644
--- a/wadsrc/static/mapinfo/strife.txt
+++ b/wadsrc/static/mapinfo/strife.txt
@@ -174,7 +174,7 @@ Intermission Inter_Strife_MAP03
 {
 	Image
 	{
-		Music = "D_FAST"
+		Music = "D_DARK"
 		Background = "SS2F1"
 		Sound = "svox/mac10"
 		Time = 9
@@ -203,7 +203,7 @@ Intermission Inter_Strife_MAP10
 {
 	Image
 	{
-		Music = "D_FAST"
+		Music = "D_DARK"
 		Background = "SS3F1"
 		Sound = "svox/mac16"
 		Time = 10