diff options
author | athrxx | 2011-05-16 18:04:03 +0200 |
---|---|---|
committer | athrxx | 2011-05-16 18:04:40 +0200 |
commit | 5fd257d3cccdb2800493237665eb1106f44fabab (patch) | |
tree | e15502ab468027e6faba4d8aa3542add5e2b2588 /engines | |
parent | 6fd78858d7c68bf91268a4cef654fa43bf0e9875 (diff) | |
download | scummvm-rg350-5fd257d3cccdb2800493237665eb1106f44fabab.tar.gz scummvm-rg350-5fd257d3cccdb2800493237665eb1106f44fabab.tar.bz2 scummvm-rg350-5fd257d3cccdb2800493237665eb1106f44fabab.zip |
SCUMM: fix regression
Diffstat (limited to 'engines')
-rw-r--r-- | engines/scumm/imuse/imuse.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp index 797d27465e..fe23b88e52 100644 --- a/engines/scumm/imuse/imuse.cpp +++ b/engines/scumm/imuse/imuse.cpp @@ -926,7 +926,7 @@ void IMuseInternal::sequencer_timers(MidiDriver *midi) { } void IMuseInternal::handle_marker(uint id, byte data) { - if (_queue_adding && _queue_sound == id && data == _queue_marker) + if ((_queue_end == _queue_pos) || (_queue_adding && _queue_sound == id && data == _queue_marker)) return; uint16 *p = _cmd_queue[_queue_end].array; |