[Scummvm-cvs-logs] CVS: scummvm insane.cpp,1.50,1.51 sound.cpp,1.121,1.122

[Pawe? Ko?odziejski]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv2288

Modified Files:
	insane.cpp sound.cpp 
Log Message:
DIG: stop play music, when SMUSH is playing

Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/insane.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- insane.cpp	4 Aug 2002 13:13:38 -0000	1.50
+++ insane.cpp	8 Aug 2002 06:45:55 -0000	1.51
@@ -1511,6 +1511,7 @@
 	pcd37.table_last_pitch = 0;
 	pcd37.table_last_flags = 0;
 
+	sm->stopBundleMusic();
 	init();
 	openFile(videoFile);
 

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- sound.cpp	4 Aug 2002 16:30:58 -0000	1.121
+++ sound.cpp	8 Aug 2002 06:45:55 -0000	1.122
@@ -811,6 +811,7 @@
 }
 
 void Scumm::stopBundleMusic() {
+	_timer->releaseProcedure(&music_handler);
 	_numberBundleMusic = -1;
 	if (_musicBundleBufFinal) 
 		free(_musicBundleBufFinal);