diff options
| author | Ori Avtalion | 2010-07-30 21:07:27 +0000 |
|---|---|---|
| committer | Ori Avtalion | 2010-07-30 21:07:27 +0000 |
| commit | 757f787a270676a38b165705c2e8b118bd5ca96d (patch) | |
| tree | 75b08ca550fc6d12f5491a57d6263c7af18a7463 /graphics/video | |
| parent | 8e705bb2e26f0900416e5649b869ee43706eeee5 (diff) | |
| download | scummvm-rg350-757f787a270676a38b165705c2e8b118bd5ca96d.tar.gz scummvm-rg350-757f787a270676a38b165705c2e8b118bd5ca96d.tar.bz2 scummvm-rg350-757f787a270676a38b165705c2e8b118bd5ca96d.zip | |
VIDEO: Ignore requests to unpause when video is already unpaused
Previous behavior was to assert
svn-id: r51517
Diffstat (limited to 'graphics/video')
| -rw-r--r-- | graphics/video/video_decoder.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/graphics/video/video_decoder.cpp b/graphics/video/video_decoder.cpp index 9733afc5cc..53a5887e4f 100644 --- a/graphics/video/video_decoder.cpp +++ b/graphics/video/video_decoder.cpp @@ -81,9 +81,14 @@ bool VideoDecoder::endOfVideo() const { void VideoDecoder::pauseVideo(bool pause) { if (pause) { _pauseLevel++; - } else { - assert(_pauseLevel); // We can't go negative + + // We can't go negative + } else if (_pauseLevel) { _pauseLevel--; + + // Do nothing + } else { + return; } if (_pauseLevel == 1 && pause) { |