[Scummvm-cvs-logs] SF.net SVN: scummvm:[54222] scummvm/trunk/engines/toon/toon.cpp

[sylvaintv at users.sourceforge.net]

Revision: 54222
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54222&view=rev
Author:   sylvaintv
Date:     2010-11-13 01:37:37 +0000 (Sat, 13 Nov 2010)

Log Message:
-----------
TOON: Fixed menu music leak

Modified Paths:
--------------
    scummvm/trunk/engines/toon/toon.cpp

Modified: scummvm/trunk/engines/toon/toon.cpp
===================================================================
--- scummvm/trunk/engines/toon/toon.cpp	2010-11-13 01:15:37 UTC (rev 54221)
+++ scummvm/trunk/engines/toon/toon.cpp	2010-11-13 01:37:37 UTC (rev 54222)
@@ -573,6 +573,7 @@
 	bool exitGame = false;
 	int clickingOn, clickRelease;
 	int menuMask = MAINMENUMASK_BASE;
+	Common::SeekableReadStream *mainmenuMusicFile = NULL;
 	AudioStreamInstance *mainmenuMusic = NULL;
 	bool musicPlaying = false;
 
@@ -581,7 +582,7 @@
 		clickRelease = false;
 
 		if (!musicPlaying) {
-			Common::SeekableReadStream *mainmenuMusicFile = resources()->openFile("misc/BR091013.MUS");
+			mainmenuMusicFile = resources()->openFile("misc/BR091013.MUS");
 			mainmenuMusic = new AudioStreamInstance(_audioManager, _mixer, mainmenuMusicFile, true);
 			mainmenuMusic->play(false);
 			musicPlaying = true;
@@ -651,6 +652,7 @@
 		if (musicPlaying) {
 			//stop music
 			mainmenuMusic->stop(false);
+			delete mainmenuMusicFile;
 			musicPlaying = false;
 		}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.