diff options
author | Joost Peters | 2004-12-21 13:26:50 +0000 |
---|---|---|
committer | Joost Peters | 2004-12-21 13:26:50 +0000 |
commit | 418c5f847303f7d177d953e35ea64ec8ed22acf7 (patch) | |
tree | 5765bfe415b74560febd7760cc55f5e05e99dc58 /queen/music.cpp | |
parent | 412df729a2dfe0dd9f45bf024f87b91af5039dd3 (diff) | |
download | scummvm-rg350-418c5f847303f7d177d953e35ea64ec8ed22acf7.tar.gz scummvm-rg350-418c5f847303f7d177d953e35ea64ec8ed22acf7.tar.bz2 scummvm-rg350-418c5f847303f7d177d953e35ea64ec8ed22acf7.zip |
Change order of close()'ing and delete'ing _driver and _parser; fixes bug #1088441
svn-id: r16241
Diffstat (limited to 'queen/music.cpp')
-rw-r--r-- | queen/music.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/queen/music.cpp b/queen/music.cpp index 3a2cd770eb..a819167578 100644 --- a/queen/music.cpp +++ b/queen/music.cpp @@ -55,10 +55,9 @@ static const byte mt32_to_gm[128] = { } MusicPlayer::~MusicPlayer() { - _driver->setTimerCallback(NULL, NULL); _parser->unloadMusic(); - this->close(); delete _parser; + this->close(); delete[] _buf; } @@ -124,7 +123,7 @@ static const byte mt32_to_gm[128] = { } void MusicPlayer::close() { - stopMusic(); + _driver->setTimerCallback(NULL, NULL); if (_driver) _driver->close(); _driver = 0; |