From 5e592d4e4aa7eb9929a9bbf1283a0382d890de84 Mon Sep 17 00:00:00 2001
From: Christopher Page
Date: Wed, 14 May 2008 23:26:32 +0000
Subject: Fixed memory leak when returning to launcher in AGOS engine by
 properly creating and deleting midi driver pointer

svn-id: r32129
---
 engines/agos/agos.cpp | 11 ++++++++---
 engines/agos/agos.h   |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'engines/agos')

diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index a79b84843c..b1586bfecc 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -558,14 +558,17 @@ int AGOSEngine::init() {
 		// Setup midi driver
 		int midiDriver = MidiDriver::detectMusicDriver(MDT_ADLIB | MDT_MIDI);
 		_nativeMT32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
-		MidiDriver *driver = MidiDriver::createMidi(midiDriver);
+		
+		_driver = MidiDriver::createMidi(midiDriver);
+
 		if (_nativeMT32) {
-			driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
+			_driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
 		}
 
 		_midi.mapMT32toGM (getGameType() != GType_SIMON2 && !_nativeMT32);
 
-		_midi.setDriver(driver);
+		_midi.setDriver(_driver);
+
 		int ret = _midi.open();
 		if (ret)
 			warning("MIDI Player init failed: \"%s\"", _midi.getErrorName (ret));
@@ -877,6 +880,7 @@ AGOSEngine::~AGOSEngine() {
 		delete _gameFile;
 
 	_midi.close();
+	delete _driver;
 
 	for (uint i = 0; i < _itemHeap.size(); i++) {
 		delete[] _itemHeap[i];
@@ -1015,6 +1019,7 @@ void AGOSEngine::shutdown() {
 		delete _gameFile;
 
 	_midi.close();
+	delete _driver;
 
 	for (uint i = 0; i < _itemHeap.size(); i++) {
 		delete[] _itemHeap[i];
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 1d5eda8392..50dbf7d6db 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -523,6 +523,7 @@ protected:
 	byte _lettersToPrintBuf[80];
 
 	MidiPlayer _midi;
+	MidiDriver *_driver;
 	bool _midiEnabled;
 	bool _nativeMT32;
 
-- 
cgit v1.2.3