[Scummvm-cvs-logs] SF.net SVN: scummvm:[50411] scummvm/trunk/engines/sci/sound/midiparser_sci. cpp
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Mon Jun 28 10:16:21 CEST 2010
Revision: 50411
http://scummvm.svn.sourceforge.net/scummvm/?rev=50411&view=rev
Author: m_kiewitz
Date: 2010-06-28 08:16:20 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
SCI: fix regression of r50405 - sq1vga right at the beginning - scripts are pausing sound and then sending manually commands afterwards
Modified Paths:
--------------
scummvm/trunk/engines/sci/sound/midiparser_sci.cpp
Modified: scummvm/trunk/engines/sci/sound/midiparser_sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/midiparser_sci.cpp 2010-06-28 07:42:16 UTC (rev 50410)
+++ scummvm/trunk/engines/sci/sound/midiparser_sci.cpp 2010-06-28 08:16:20 UTC (rev 50411)
@@ -165,6 +165,12 @@
// 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);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list