Backported fix for last-minute BS2 regression.

svn-id: r20359
scummvm · Feb 3, 2006 · 3be8a98 · 3be8a98
1 parent 2587e5c
commit 3be8a98
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/sword2/sound.cpp b/sword2/sound.cpp
@@ -268,6 +268,13 @@ int32 Sound::playFx(Audio::SoundHandle *handle, byte *data, uint32 len, uint8 vo
 		return RDERR_INVALIDWAV;
 	}
 
+	// The resource manager must have complete control over when resources
+	// are freed, or reference counting will break horribly. Besides, the
+	// data pointer is not valid for passing to free(). Why the hell is the
+	// AUTOFREE flag set by default anyway?
+
+	flags &= ~Audio::Mixer::FLAG_AUTOFREE;
+
 	if (isReverseStereo())
 		flags |= Audio::Mixer::FLAG_REVERSE_STEREO;