From 42af771de001b3006ff5885033ae17c22923b4d6 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Tue, 20 Oct 2009 20:15:13 +0000
Subject: Fixed regression introduced when adding support for looping
 background sounds. A.k.a. "I played through the whole game looking for
 regressions, and missed the one at the intro cutscene?!"

svn-id: r45290
---
 engines/sword1/control.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'engines/sword1/control.cpp')

diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp
index 31db54c4c8..2b6509163e 100644
--- a/engines/sword1/control.cpp
+++ b/engines/sword1/control.cpp
@@ -414,10 +414,9 @@ uint8 Control::runPanel(void) {
 	_system->copyRectToScreen(_screenBuf, 640, 0, 0, 640, 480);
 	free(_screenBuf);
 	_mouse->controlPanel(false);
-	if (retVal == CONTROL_NOTHING_DONE) {
-		_music->startMusic(Logic::_scriptVars[CURRENT_MUSIC], 1);
-		_sound->newScreen(Logic::_scriptVars[SCREEN]);
-	}
+	// Can also be used to end the control panel music.
+	_music->startMusic(Logic::_scriptVars[CURRENT_MUSIC], 1);
+	_sound->newScreen(Logic::_scriptVars[SCREEN]);
 	_panelShown = false;
 	return retVal;
 }
-- 
cgit v1.2.3