[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.120,1.121

Pawel Kolodziejski aquadran at users.sourceforge.net
Sat Feb 12 07:01:29 CET 2005


Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26043

Modified Files:
	dimuse.cpp 
Log Message:
fix/workaround for bug: 1120625 

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- dimuse.cpp	28 Jan 2005 22:05:45 -0000	1.120
+++ dimuse.cpp	12 Feb 2005 15:00:16 -0000	1.121
@@ -144,7 +144,14 @@
 			track->soundHandle = _sound->openSound(track->soundId,
 									track->soundName, track->soundType,
 									track->volGroupId, -1);
-			assert(track->soundHandle);
+			if (!track->soundHandle) {
+				warning("IMuseDigital::saveOrLoad: Can't open sound so will not be resumed, propably on diffrent CD");
+				track->stream2 = NULL;
+				track->stream = NULL;
+				track->used = false;
+				continue;
+			}
+
 			if (track->compressed) {
 				track->regionOffset = 0;
 			}





More information about the Scummvm-git-logs mailing list