From 98067b0fe6cdccd6a1cbc6abda8fa36a39bb7fd7 Mon Sep 17 00:00:00 2001
From: Adrian Frühwirth
Date: Sat, 19 May 2018 21:03:14 +0200
Subject: WINTERMUTE: Properly fix handling of Ogg Vorbis resources

---
 engines/wintermute/base/sound/base_sound_buffer.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'engines/wintermute/base/sound')

diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp
index 9891db1cb2..0c8103339f 100644
--- a/engines/wintermute/base/sound/base_sound_buffer.cpp
+++ b/engines/wintermute/base/sound/base_sound_buffer.cpp
@@ -104,12 +104,13 @@ bool BaseSoundBuffer::loadFromFile(const Common::String &filename, bool forceRel
 	}
 	Common::String strFilename(filename);
 	strFilename.toLowercase();
-	#ifdef USE_VORBIS
-		if (strFilename.hasSuffix(".ogg")) {
-			_stream = Audio::makeVorbisStream(_file, DisposeAfterUse::YES);
-		} else
-	#endif
-	if (strFilename.hasSuffix(".wav")) {
+	if (strFilename.hasSuffix(".ogg")) {
+#ifdef USE_VORBIS
+		_stream = Audio::makeVorbisStream(_file, DisposeAfterUse::YES);
+#else
+		error("BSoundBuffer::LoadFromFile - Ogg Vorbis not supported by this version of ScummVM (please report as this shouldn't trigger)");
+#endif
+	} else if (strFilename.hasSuffix(".wav")) {
 		int waveSize, waveRate;
 		byte waveFlags;
 		uint16 waveType;
-- 
cgit v1.2.3