[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.53,1.54 simon.cpp,1.287,1.288
Jamieson Christian
jamieson630 at users.sourceforge.net
Fri Aug 8 02:49:05 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.286,1.287
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.149,1.150 debugger.cpp,1.74,1.75 gfx.cpp,2.182,2.183 script_v5.cpp,1.145,1.146 scumm.h,1.281,1.282 scummvm.cpp,2.319,2.320
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv23352/scummvm/simon
Modified Files:
midi.cpp simon.cpp
Log Message:
More Simon shutdown cleanup
Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- midi.cpp 8 Aug 2003 09:36:37 -0000 1.53
+++ midi.cpp 8 Aug 2003 09:48:42 -0000 1.54
@@ -92,12 +92,12 @@
void MidiPlayer::close() {
stop();
- _system->lock_mutex (_mutex);
+// _system->lock_mutex (_mutex);
if (_driver)
_driver->close();
_driver = NULL;
clearConstructs();
- _system->unlock_mutex (_mutex);
+// _system->unlock_mutex (_mutex);
}
void MidiPlayer::send (uint32 b) {
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -d -r1.287 -r1.288
--- simon.cpp 8 Aug 2003 09:42:38 -0000 1.287
+++ simon.cpp 8 Aug 2003 09:48:42 -0000 1.288
@@ -4544,6 +4544,7 @@
case OSystem::EVENT_QUIT:
shutdown();
+ return;
break;
default:
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.286,1.287
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.149,1.150 debugger.cpp,1.74,1.75 gfx.cpp,2.182,2.183 script_v5.cpp,1.145,1.146 scumm.h,1.281,1.282 scummvm.cpp,2.319,2.320
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list