[Scummvm-cvs-logs] SF.net SVN: scummvm:[53060] scummvm/trunk/engines/sci/sound/music.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Thu Oct 7 23:50:48 CEST 2010
Revision: 53060
http://scummvm.svn.sourceforge.net/scummvm/?rev=53060&view=rev
Author: thebluegr
Date: 2010-10-07 21:50:47 +0000 (Thu, 07 Oct 2010)
Log Message:
-----------
SCI: Fix for bug #3083151 - "QFG3: Long pause while loading specific savegame"
Modified Paths:
--------------
scummvm/trunk/engines/sci/sound/music.cpp
Modified: scummvm/trunk/engines/sci/sound/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/music.cpp 2010-10-07 20:50:15 UTC (rev 53059)
+++ scummvm/trunk/engines/sci/sound/music.cpp 2010-10-07 21:50:47 UTC (rev 53060)
@@ -399,8 +399,14 @@
if (pSnd->status == kSoundStopped) {
pSnd->pMidiParser->jumpToTick(0);
} else {
+ // Disable sound looping before fast forwarding to the last position,
+ // when loading a saved game. Fixes bug #3083151.
+ uint16 prevLoop = pSnd->loop;
+ pSnd->loop = 0;
// Fast forward to the last position and perform associated events when loading
pSnd->pMidiParser->jumpToTick(pSnd->ticker, true);
+ // Restore looping
+ pSnd->loop = prevLoop;
}
pSnd->pMidiParser->mainThreadEnd();
_mutex.unlock();
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