diff options
| author | Filippos Karapetis | 2010-10-27 19:22:37 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-10-27 19:22:37 +0000 |
| commit | e85f43877aa4e2e2750c6f2d5cfd3f562d893fe5 (patch) | |
| tree | ce32171d3e57a6b5cc264d3c25e493c630663f36 /engines/sci/console.cpp | |
| parent | 5a336830a00c1371d8307794c7e43fe98e7baa1d (diff) | |
| download | scummvm-rg350-e85f43877aa4e2e2750c6f2d5cfd3f562d893fe5.tar.gz scummvm-rg350-e85f43877aa4e2e2750c6f2d5cfd3f562d893fe5.tar.bz2 scummvm-rg350-e85f43877aa4e2e2750c6f2d5cfd3f562d893fe5.zip | |
SCI: Proper pausing/resuming of MIDI music in SciEngine::pauseEngineIntern(), Console::preEnter() and Console::postEnter() and added a sanity check in SciEngine::getDebugger()
svn-id: r53886
Diffstat (limited to 'engines/sci/console.cpp')
| -rw-r--r-- | engines/sci/console.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 77a7684713..9c06c40121 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -219,14 +219,16 @@ Console::~Console() { } void Console::preEnter() { - if (g_sci && g_sci->_soundCmd) - g_sci->_soundCmd->pauseAll(true); + if (_engine && _engine->_soundCmd) + _engine->_soundCmd->pauseAll(true); + g_system->getMixer()->pauseAll(true); _enterTime = g_system->getMillis(); } void Console::postEnter() { - if (g_sci && g_sci->_soundCmd) + if (_engine && _engine->_soundCmd) g_sci->_soundCmd->pauseAll(false); + g_system->getMixer()->pauseAll(false); if (!_videoFile.empty()) { _engine->_gfxCursor->kernelHide(); |