diff options
| author | athrxx | 2011-05-23 16:37:58 +0200 |
|---|---|---|
| committer | unknown | 2011-05-29 01:04:01 +0200 |
| commit | c60807cbb9dec063c0b00f8d6ffdb19e83db48f3 (patch) | |
| tree | 8a590760f7a5047f9a7ae739699d7a53bffe0e27 /engines/scumm | |
| parent | 3d42141e9dda203a5dae7bb91384405be5abc243 (diff) | |
| download | scummvm-rg350-c60807cbb9dec063c0b00f8d6ffdb19e83db48f3.tar.gz scummvm-rg350-c60807cbb9dec063c0b00f8d6ffdb19e83db48f3.tar.bz2 scummvm-rg350-c60807cbb9dec063c0b00f8d6ffdb19e83db48f3.zip | |
FM-TOWNS AUDIO: Unlock internal mutex before calling imuse timer proc.
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/player_towns.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/scumm/player_towns.cpp b/engines/scumm/player_towns.cpp index 15b2f65797..e71a8d0587 100644 --- a/engines/scumm/player_towns.cpp +++ b/engines/scumm/player_towns.cpp @@ -581,15 +581,12 @@ Player_Towns_v2::Player_Towns_v2(ScummEngine *vm, Audio::Mixer *mixer, IMuse *im } Player_Towns_v2::~Player_Towns_v2() { - // Avoid lockup in imuse.cpp, line 78 - _intf->lockInternal(); - if (_imuseDispose) - delete _imuse; - _intf->unlockInternal(); - delete _intf; _intf = 0; + if (_imuseDispose) + delete _imuse; + delete[] _sblData; delete[] _soundOverride; } |