aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMax Horn2007-07-22 11:54:35 +0000
committerMax Horn2007-07-22 11:54:35 +0000
commit19ad20c201adca6bac5dff1cea4da34d8a99a6c3 (patch)
tree69657eb7b0ebf8146ddc2313d1c641ca8f93c65a /sound
parent425e6e278b323f95af5b223d06bec74f0db8d047 (diff)
downloadscummvm-rg350-19ad20c201adca6bac5dff1cea4da34d8a99a6c3.tar.gz
scummvm-rg350-19ad20c201adca6bac5dff1cea4da34d8a99a6c3.tar.bz2
scummvm-rg350-19ad20c201adca6bac5dff1cea4da34d8a99a6c3.zip
Don't be so strict about un-pausing sounds which are not paused currently
svn-id: r28163
Diffstat (limited to 'sound')
-rw-r--r--sound/mixer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index 4ca7b4c897..93a661d80f 100644
--- a/sound/mixer.cpp
+++ b/sound/mixer.cpp
@@ -77,11 +77,11 @@ public:
return _input->endOfStream();
}
void pause(bool paused) {
- assert((paused && _pauseLevel >= 0) || (!paused && _pauseLevel));
+ //assert((paused && _pauseLevel >= 0) || (!paused && _pauseLevel));
if (paused)
_pauseLevel++;
- else
+ else if (_pauseLevel > 0)
_pauseLevel--;
}
bool isPaused() {