[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_sndmgr.cpp,1.23,1.24

Pawel Kolodziejski aquadran at users.sourceforge.net
Sun Jan 18 01:36:01 CET 2004


Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1:/tmp/cvs-serv18978

Modified Files:
	dimuse_sndmgr.cpp 
Log Message:
cleanup

Index: dimuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- dimuse_sndmgr.cpp	15 Jan 2004 20:37:26 -0000	1.23
+++ dimuse_sndmgr.cpp	18 Jan 2004 09:35:05 -0000	1.24
@@ -38,8 +38,7 @@
 
 ImuseDigiSndMgr::~ImuseDigiSndMgr() {
 	for (int l = 0; l < MAX_IMUSE_SOUNDS; l++) {
-		if (&_sounds[l])
-			closeSound(&_sounds[l]);
+		closeSound(&_sounds[l]);
 	}
 #ifdef __PALM_OS__
 	BundleCodecs::releaseImcTables();
@@ -281,7 +280,8 @@
 			if (_sounds[l]._bundle)
 				delete _sounds[l]._bundle;
 			for (int r = 0; r < _sounds[l].numSyncs; r++)
-				free(_sounds[l].sync[r].ptr);
+				if (_sounds[l].sync[r].ptr)
+					free(_sounds[l].sync[r].ptr);
 			memset(&_sounds[l], 0, sizeof(soundStruct));
 		}
 	}





More information about the Scummvm-git-logs mailing list