From 68ebdf20d5e8ae24029b0e1d7cfa1e3e89e455f9 Mon Sep 17 00:00:00 2001 From: Sven Hesse Date: Sun, 16 Jan 2011 22:28:20 +0000 Subject: [PATCH] GOB: Don't clobber the global palette svn-id: r55270 --- engines/gob/videoplayer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp index 4bbb6a55ceb..5bd7d080054 100644 --- a/engines/gob/videoplayer.cpp +++ b/engines/gob/videoplayer.cpp @@ -753,7 +753,7 @@ Graphics::CoktelDecoder *VideoPlayer::openVideo(const Common::String &file, Prop } void VideoPlayer::copyPalette(const Video &video, int16 palStart, int16 palEnd) { - if (!video.decoder->hasPalette()) + if (!video.decoder->hasPalette() || !video.decoder->isPaletted()) return; if (palStart < 0)