From e997d05b3c1e8e04acb7d11804aaf3880aa06dcf Mon Sep 17 00:00:00 2001
From: Robert Göffringmann
Date: Mon, 14 Jul 2003 09:26:50 +0000
Subject: fixed toggling music on/off after savegame restore

svn-id: r9007
---
 sky/control.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sky/control.cpp')

diff --git a/sky/control.cpp b/sky/control.cpp
index 4d20239a54..094373d5b7 100644
--- a/sky/control.cpp
+++ b/sky/control.cpp
@@ -1452,7 +1452,9 @@ uint16 SkyControl::parseSaveData(uint8 *srcBuf) {
 		_skyLogic->fnEnterSection(SkyLogic::_scriptVariables[CUR_SECTION], 0, 0);
 	}
 	_skyDisk->refreshFilesList(reloadList);
-	_skyMusic->startMusic((uint16)music);
+	SkyState::_systemVars.currentMusic = (uint16)music;
+	if (!(SkyState::_systemVars.systemFlags & SF_MUS_OFF))
+		_skyMusic->startMusic((uint16)music);
 	_savedMouse = (uint16)mouseType;
 	SkyState::_systemVars.currentPalette = palette; // will be set when doControlPanel ends
 	SkyState::_systemVars.systemFlags |= SF_GAME_RESTORED; // what's that for?
-- 
cgit v1.2.3