[Scummvm-cvs-logs] scummvm master -> 4e80bb12d46198f39aa3fee7c13f6aa62e27ba60

[Strangerke]

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:
4e80bb12d4 VOYEUR: Fix crash introduced in 4065c795277bbb4cb2db6dbd8fef145b6c5c6c7f


Commit: 4e80bb12d46198f39aa3fee7c13f6aa62e27ba60
    https://github.com/scummvm/scummvm/commit/4e80bb12d46198f39aa3fee7c13f6aa62e27ba60
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-20T12:50:34-08:00

Commit Message:
VOYEUR: Fix crash introduced in 4065c795277bbb4cb2db6dbd8fef145b6c5c6c7f

Changed paths:
    engines/voyeur/graphics.cpp



diff --git a/engines/voyeur/graphics.cpp b/engines/voyeur/graphics.cpp
index 00d6c02..5590833 100644
--- a/engines/voyeur/graphics.cpp
+++ b/engines/voyeur/graphics.cpp
@@ -138,10 +138,15 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
 	if (srcDisplay->_flags & DISPFLAG_VIEWPORT) {
 		// A viewport was passed, not a picture
 		srcPic = ((ViewPortResource *)srcDisplay)->_currentPic;
+	} else {
+		srcPic = (PictureResource *)srcDisplay;
+	}
+
+	if (destDisplay->_flags & DISPFLAG_VIEWPORT) {
+		// A viewport was passed, not a picture
 		destViewPort = (ViewPortResource *)destDisplay;
 		destPic = destViewPort->_currentPic;
 	} else {
-		srcPic = (PictureResource *)srcDisplay;
 		destPic = (PictureResource *)destDisplay;
 	}