[Scummvm-cvs-logs] SF.net SVN: scummvm:[53064] scummvm/branches/branch-1-2-0/engines/sci/sound /music.cpp

[thebluegr at users.sourceforge.net]

Revision: 53064
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53064&view=rev
Author:   thebluegr
Date:     2010-10-08 05:10:49 +0000 (Fri, 08 Oct 2010)

Log Message:
-----------
SCI: Fix for bug #3083151 - "QFG3: Long pause while loading specific savegame" (backport)

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/engines/sci/sound/music.cpp

Modified: scummvm/branches/branch-1-2-0/engines/sci/sound/music.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/engines/sci/sound/music.cpp	2010-10-08 00:29:58 UTC (rev 53063)
+++ scummvm/branches/branch-1-2-0/engines/sci/sound/music.cpp	2010-10-08 05:10:49 UTC (rev 53064)
@@ -386,8 +386,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.