From 8e3485f15876e913ddbb982f36ea089665c08eab Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Thu, 13 Nov 2008 09:19:42 +0000 Subject: Added better checks for the current music status in pauseEngineIntern() svn-id: r35035 --- engines/saga/saga.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'engines/saga/saga.cpp') diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp index f20672d46b..e12bdbdd5d 100644 --- a/engines/saga/saga.cpp +++ b/engines/saga/saga.cpp @@ -147,6 +147,7 @@ Common::Error SagaEngine::init() { _copyProtection = ConfMan.getBool("copy_protection"); _gf_wyrmkeep = false; _gf_compressed_sounds = false; + _musicWasPlaying = false; if (_readingSpeed > 3) _readingSpeed = 0; @@ -539,12 +540,17 @@ void SagaEngine::pauseEngineIntern(bool pause) { if (pause) { _render->setFlag(RF_RENDERPAUSE); - if (!_music->hasDigitalMusic()) + if (_music->isPlaying()) { _music->pause(); + _musicWasPlaying = true; + } else { + _musicWasPlaying = false; + } } else { _render->clearFlag(RF_RENDERPAUSE); - if (!_music->hasDigitalMusic()) + if (_musicWasPlaying) { _music->resume(); + } } _mixer->pauseAll(pause); -- cgit v1.2.3