[Scummvm-cvs-logs] SF.net SVN: scummvm:[40885] scummvm/trunk/engines/sci/engine/ksound.cpp

[thebluegr at users.sourceforge.net]

Revision: 40885
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40885&view=rev
Author:   thebluegr
Date:     2009-05-25 11:44:24 +0000 (Mon, 25 May 2009)

Log Message:
-----------
Fixed crash when starting KQ6

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/ksound.cpp

Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp	2009-05-25 11:18:29 UTC (rev 40884)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp	2009-05-25 11:44:24 UTC (rev 40885)
@@ -999,6 +999,9 @@
 	Audio::Mixer *mixer = g_system->getMixer();
 	int sampleLen = 0;
 
+	if (!s->sound.audioResource)
+		s->sound.audioResource = new AudioResource();
+
 	switch (UKPV(0)) {
 	case kSci1AudioWPlay:
 	case kSci1AudioPlay: {
@@ -1039,13 +1042,7 @@
 		mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, UKPV(1));
 		break;
 	case kSci1AudioLanguage:
-		if (s->sound.audioResource)
-			delete s->sound.audioResource;
-
-		// The audio resource is freed when freeing all resources
-		s->sound.audioResource = new AudioResource();
 		s->sound.audioResource->setAudioLang(SKPV(1));
-
 		break;
 	default:
 		warning("kDoAudio: Unhandled case %d", UKPV(0));


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