From 66aeee8ddc3affec0708e51c2ab78cad2f6b7440 Mon Sep 17 00:00:00 2001 From: Sven Hesse Date: Sun, 8 Aug 2010 00:51:33 +0000 Subject: VIDEO: Don't crash when sound is disabled :P svn-id: r51886 --- graphics/video/coktel_decoder.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/graphics/video/coktel_decoder.cpp b/graphics/video/coktel_decoder.cpp index ca72f87808..15899fb13d 100644 --- a/graphics/video/coktel_decoder.cpp +++ b/graphics/video/coktel_decoder.cpp @@ -1057,20 +1057,18 @@ void IMDDecoder::processFrame() { } // Audio - if (_soundStage != kSoundNone) { - if (cmd == kCommandNextSound) { + if (cmd == kCommandNextSound) { - nextSoundSlice(hasNextCmd); - cmd = _stream->readUint16LE(); + nextSoundSlice(hasNextCmd); + cmd = _stream->readUint16LE(); - } else if (cmd == kCommandStartSound) { + } else if (cmd == kCommandStartSound) { - startSound = initialSoundSlice(hasNextCmd); - cmd = _stream->readUint16LE(); + startSound = initialSoundSlice(hasNextCmd); + cmd = _stream->readUint16LE(); - } else - emptySoundSlice(hasNextCmd); - } + } else + emptySoundSlice(hasNextCmd); // Set palette if (cmd == kCommandPalette) { -- cgit v1.2.3