aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2013-08-09 14:19:12 +0200
committerEinar Johan Trøan Sømåen2013-08-09 18:20:04 +0200
commita1d02cbe97f6ff3fbd27e3a70f93dbd8cf3e545e (patch)
tree2c41dab5231383fadc2b9c8c1bcf5ebf560f1f0a /engines/wintermute
parent976b4167f13c4f2e922ccc2d0acb91a4a0d12c2d (diff)
downloadscummvm-rg350-a1d02cbe97f6ff3fbd27e3a70f93dbd8cf3e545e.tar.gz
scummvm-rg350-a1d02cbe97f6ff3fbd27e3a70f93dbd8cf3e545e.tar.bz2
scummvm-rg350-a1d02cbe97f6ff3fbd27e3a70f93dbd8cf3e545e.zip
WINTERMUTE: Avoid setting alpha-image when filename is ""
Diffstat (limited to 'engines/wintermute')
-rw-r--r--engines/wintermute/video/video_theora_player.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index 12884a76c3..ef4d6b4dd9 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -417,7 +417,7 @@ bool VideoTheoraPlayer::display(uint32 alpha) {
bool VideoTheoraPlayer::setAlphaImage(const Common::String &filename) {
delete _alphaImage;
_alphaImage = new BaseImage();
- if (!_alphaImage || DID_FAIL(_alphaImage->loadFile(filename))) {
+ if (filename == "" || !_alphaImage || DID_FAIL(_alphaImage->loadFile(filename))) {
delete _alphaImage;
_alphaImage = nullptr;
_alphaFilename = "";