diff options
| author | Martin Kiewitz | 2010-07-06 14:10:09 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-07-06 14:10:09 +0000 |
| commit | a7cd1534c6d3a325e36db42314e22ff3d8bdc8dd (patch) | |
| tree | 7e1e60e9e5047e94c5af022c8541e1bcea3bc9e5 /engines/sci/engine | |
| parent | c89fe5f6d56b6d6e11b7d642e85633bc86098ce8 (diff) | |
| download | scummvm-rg350-a7cd1534c6d3a325e36db42314e22ff3d8bdc8dd.tar.gz scummvm-rg350-a7cd1534c6d3a325e36db42314e22ff3d8bdc8dd.tar.bz2 scummvm-rg350-a7cd1534c6d3a325e36db42314e22ff3d8bdc8dd.zip | |
SCI: fix regression of r50721 - pausing/resuming only on actual menu usage
svn-id: r50724
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/kmenu.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp index 69ec07559e..c8a6e03556 100644 --- a/engines/sci/engine/kmenu.cpp +++ b/engines/sci/engine/kmenu.cpp @@ -91,16 +91,8 @@ reg_t kDrawMenuBar(EngineState *s, int argc, reg_t *argv) { reg_t kMenuSelect(EngineState *s, int argc, reg_t *argv) { reg_t eventObject = argv[0]; bool pauseSound = argc > 1 ? (argv[1].isNull() ? false : true) : true; - reg_t result; - if (pauseSound) - g_sci->_soundCmd->pauseAll(true); - - result = g_sci->_gfxMenu->kernelSelect(eventObject); - - if (pauseSound) - g_sci->_soundCmd->pauseAll(false); - return result; + return g_sci->_gfxMenu->kernelSelect(eventObject, pauseSound); } } // End of namespace Sci |