diff options
| author | Martin Kiewitz | 2010-06-28 08:16:20 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-06-28 08:16:20 +0000 |
| commit | 698f10611ccf82b0941b04f7d2bcebfe0c971b84 (patch) | |
| tree | dd70a6b738fac418698e89eb648294597f37f146 /engines/sci | |
| parent | 31af2bfe32429563563d5beaa320a23fc035ad71 (diff) | |
| download | scummvm-rg350-698f10611ccf82b0941b04f7d2bcebfe0c971b84.tar.gz scummvm-rg350-698f10611ccf82b0941b04f7d2bcebfe0c971b84.tar.bz2 scummvm-rg350-698f10611ccf82b0941b04f7d2bcebfe0c971b84.zip | |
SCI: fix regression of r50405 - sq1vga right at the beginning - scripts are pausing sound and then sending manually commands afterwards
svn-id: r50411
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/sound/midiparser_sci.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp index 099d4572be..9cedb86349 100644 --- a/engines/sci/sound/midiparser_sci.cpp +++ b/engines/sci/sound/midiparser_sci.cpp @@ -165,6 +165,12 @@ void MidiParser_SCI::sendFromScriptToDriver(uint32 midi) { // this happens for cmdSendMidi at least in sq1vga right at the start, it's a script issue return; } + if (_channelRemap[midiChannel] == -1) { + // trying to send to an unmapped channel + // this happens for cmdSendMidi at least in sq1vga right at the start, scripts are pausing the sound + // and then sending manually. it's a script issue + return; + } sendToDriver(midi); } |