[Scummvm-cvs-logs] scummvm master -> a1d02cbe97f6ff3fbd27e3a70f93dbd8cf3e545e

[somaen]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a1d02cbe97 WINTERMUTE: Avoid setting alpha-image when filename is ""


Commit: a1d02cbe97f6ff3fbd27e3a70f93dbd8cf3e545e
    https://github.com/scummvm/scummvm/commit/a1d02cbe97f6ff3fbd27e3a70f93dbd8cf3e545e
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-08-09T09:20:04-07:00

Commit Message:
WINTERMUTE: Avoid setting alpha-image when filename is ""

Changed paths:
    engines/wintermute/video/video_theora_player.cpp



diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index 12884a7..ef4d6b4 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 = "";