From de29c28483567c84c9b875f8b12202797985d74f Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Fri, 27 Jul 2007 01:33:05 +0000
Subject: Only set soundMode, if compressed segment exists.

svn-id: r28227
---
 engines/scumm/imuse_digi/dimuse_sndmgr.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
index acc6593347..625a24ef81 100644
--- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -615,22 +615,24 @@ int32 ImuseDigiSndMgr::getDataFromRegion(SoundDesc *soundDesc, int region, byte
 			if (!len) {
 				sprintf(fileName, "%s_reg%03d.ogg", soundDesc->name, region);
 				cmpFile = soundDesc->bundle->getFile(fileName, offs, len);
+				if (len) {
 #ifndef USE_VORBIS
-				if (len)
 					error("Vorbis library compiled support needed!");
 #endif
-				soundMode = 2;
+					soundMode = 2;
+				}
 			}
 			if (!len) {
 				sprintf(fileName, "%s_reg%03d.mp3", soundDesc->name, region);
 				cmpFile = soundDesc->bundle->getFile(fileName, offs, len);
+				if (len) {
 #ifndef USE_MAD
-				if (len)
 					error("Mad library compiled support needed!");
 #endif
-				assert(len);
-				soundMode = 1;
+					soundMode = 1;
+				}
 			}
+			assert(len);
 
 			if (!soundDesc->compressedStream) {
 				Common::MemoryReadStream *tmp = cmpFile->readStream(len);
-- 
cgit v1.2.3