aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/videoplayer.cpp
diff options
context:
space:
mode:
authorSven Hesse2011-01-20 12:28:46 +0000
committerSven Hesse2011-01-20 12:28:46 +0000
commit3976342ec0120fb2b9817dc06cbf05e48ab521c3 (patch)
treea75eb1099fb3637c198b57a928729c4d024af5b2 /engines/gob/videoplayer.cpp
parent75c840b52782489639e95509495bd3ddf3513fea (diff)
downloadscummvm-rg350-3976342ec0120fb2b9817dc06cbf05e48ab521c3.tar.gz
scummvm-rg350-3976342ec0120fb2b9817dc06cbf05e48ab521c3.tar.bz2
scummvm-rg350-3976342ec0120fb2b9817dc06cbf05e48ab521c3.zip
GOB: Don't not play videos with only sound
svn-id: r55349
Diffstat (limited to 'engines/gob/videoplayer.cpp')
-rw-r--r--engines/gob/videoplayer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp
index c89f598d10..c9dae63fa5 100644
--- a/engines/gob/videoplayer.cpp
+++ b/engines/gob/videoplayer.cpp
@@ -114,7 +114,8 @@ int VideoPlayer::openVideo(bool primary, const Common::String &file, Properties
if (!(video->decoder = openVideo(file, properties)))
return -1;
- if (video->decoder->isPaletted() != !_vm->isTrueColor()) {
+ if (video->decoder->hasVideo() && !(properties.flags & kFlagNoVideo) &&
+ (video->decoder->isPaletted() != !_vm->isTrueColor())) {
if (!properties.switchColorMode)
return -1;