From 418c5f847303f7d177d953e35ea64ec8ed22acf7 Mon Sep 17 00:00:00 2001
From: Joost Peters
Date: Tue, 21 Dec 2004 13:26:50 +0000
Subject: Change order of close()'ing and delete'ing _driver and _parser; fixes
 bug #1088441

svn-id: r16241
---
 queen/music.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'queen')

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;
-- 
cgit v1.2.3