From 6632a4df53bd6cd94d85057ceae10f14108a67e4 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 19 Mar 2006 05:15:49 +0000
Subject: Revert FLAG_AUTOFREE changes to loadWAVFromStreammakeWAVStream

svn-id: r21376
---
 sound/wave.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sound')

diff --git a/sound/wave.cpp b/sound/wave.cpp
index f6ba3fed27..fdb358a1a9 100644
--- a/sound/wave.cpp
+++ b/sound/wave.cpp
@@ -111,7 +111,7 @@ bool loadWAVFromStream(Common::SeekableReadStream &stream, int &size, int &rate,
 	// Prepare the return values.
 	rate = samplesPerSec;
 
-	flags = Audio::Mixer::FLAG_AUTOFREE;
+	flags = 0;
 	if (bitsPerSample == 8)		// 8 bit data is unsigned
 		flags |= Audio::Mixer::FLAG_UNSIGNED;
 	else if (bitsPerSample == 16)	// 16 bit data is signed little endian
@@ -164,6 +164,8 @@ AudioStream *makeWAVStream(Common::SeekableReadStream &stream) {
 	if (!loadWAVFromStream(stream, size, rate, flags, &type))
 		return 0;
 
+	flags |= Audio::Mixer::FLAG_AUTOFREE;
+
 	if (type == 17) // IMA ADPCM
 		return makeADPCMStream(&stream, size, kADPCMIma, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1);
 
-- 
cgit v1.2.3