diff options
| author | Jamieson Christian | 2003-08-08 09:48:42 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-08-08 09:48:42 +0000 |
| commit | 0ca58111c6511e9b00be5ebeaadadfe1b8da697c (patch) | |
| tree | 3684057ba7d1e4da25a106374e481ed5a5783b6e /simon | |
| parent | 47d98f94db3a5972d4af2b1e7b973dc10700bd39 (diff) | |
| download | scummvm-rg350-0ca58111c6511e9b00be5ebeaadadfe1b8da697c.tar.gz scummvm-rg350-0ca58111c6511e9b00be5ebeaadadfe1b8da697c.tar.bz2 scummvm-rg350-0ca58111c6511e9b00be5ebeaadadfe1b8da697c.zip | |
More Simon shutdown cleanup
svn-id: r9602
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/midi.cpp | 4 | ||||
| -rw-r--r-- | simon/simon.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/simon/midi.cpp b/simon/midi.cpp index 2227d7a03c..d4ee8ddf49 100644 --- a/simon/midi.cpp +++ b/simon/midi.cpp @@ -92,12 +92,12 @@ int MidiPlayer::open() { 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) { diff --git a/simon/simon.cpp b/simon/simon.cpp index 49cdf39077..2e7bfefbb9 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -4544,6 +4544,7 @@ void SimonEngine::delay(uint amount) { case OSystem::EVENT_QUIT: shutdown(); + return; break; default: |