diff options
| author | Johannes Schickel | 2010-03-22 15:54:56 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-03-22 15:54:56 +0000 |
| commit | 86653687d7369a46ac25ef4a3cd513b401807c67 (patch) | |
| tree | 72b8042a9325fbf89e0271d37e484d86d5973c9f /sound/audiostream.cpp | |
| parent | a725b490e8a190e276fc689d4a147b7c49e98d7c (diff) | |
| download | scummvm-rg350-86653687d7369a46ac25ef4a3cd513b401807c67.tar.gz scummvm-rg350-86653687d7369a46ac25ef4a3cd513b401807c67.tar.bz2 scummvm-rg350-86653687d7369a46ac25ef4a3cd513b401807c67.zip | |
Fix for bug #2969211 "NIPPON: Crash in Intro".
It is not a good idea to supply an SubLoopingAudioStream with the start
and end time to be exactly the same time. Clarify that in the
SubLoopingAudioStream documentation, add an assert in the
SubLoopingAudioStream constructor for that case and also prevent
make8SVXStream from doing so.
svn-id: r48356
Diffstat (limited to 'sound/audiostream.cpp')
| -rw-r--r-- | sound/audiostream.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp index 1d81eba608..ce2c521e5e 100644 --- a/sound/audiostream.cpp +++ b/sound/audiostream.cpp @@ -169,6 +169,8 @@ SubLoopingAudioStream::SubLoopingAudioStream(SeekableAudioStream *stream, _loopStart(convertTimeToStreamPos(loopStart, getRate(), isStereo())), _loopEnd(convertTimeToStreamPos(loopEnd, getRate(), isStereo())), _done(false) { + assert(loopStart < loopEnd); + if (!_parent->rewind()) _done = true; } |