[Scummvm-cvs-logs] SF.net SVN: scummvm:[55247] scummvm/trunk/engines/sci/sound/music.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Sat Jan 15 10:28:44 CET 2011
Revision: 55247
http://scummvm.svn.sourceforge.net/scummvm/?rev=55247&view=rev
Author: thebluegr
Date: 2011-01-15 09:28:42 +0000 (Sat, 15 Jan 2011)
Log Message:
-----------
SCI: Bugfix for r55246: Don't send init commands when resuming a sound
Modified Paths:
--------------
scummvm/trunk/engines/sci/sound/music.cpp
Modified: scummvm/trunk/engines/sci/sound/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/music.cpp 2011-01-15 00:29:02 UTC (rev 55246)
+++ scummvm/trunk/engines/sci/sound/music.cpp 2011-01-15 09:28:42 UTC (rev 55247)
@@ -431,7 +431,8 @@
_mutex.lock();
pSnd->pMidiParser->mainThreadBegin();
pSnd->pMidiParser->tryToOwnChannels();
- pSnd->pMidiParser->sendInitCommands();
+ if (pSnd->status != kSoundPaused)
+ pSnd->pMidiParser->sendInitCommands();
pSnd->pMidiParser->setVolume(pSnd->volume);
if (pSnd->status == kSoundStopped) {
pSnd->pMidiParser->jumpToTick(0);
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