aboutsummaryrefslogtreecommitdiff
path: root/engines/voyeur/graphics.cpp
diff options
context:
space:
mode:
authorStrangerke2014-02-20 21:50:34 +0100
committerStrangerke2014-02-20 21:50:34 +0100
commit4e80bb12d46198f39aa3fee7c13f6aa62e27ba60 (patch)
tree98697f3c2fff77b9e6f1efe46433de902e5501f9 /engines/voyeur/graphics.cpp
parent5a5783841691882b914e6c6804baf3031e967ace (diff)
downloadscummvm-rg350-4e80bb12d46198f39aa3fee7c13f6aa62e27ba60.tar.gz
scummvm-rg350-4e80bb12d46198f39aa3fee7c13f6aa62e27ba60.tar.bz2
scummvm-rg350-4e80bb12d46198f39aa3fee7c13f6aa62e27ba60.zip
VOYEUR: Fix crash introduced in 4065c795277bbb4cb2db6dbd8fef145b6c5c6c7f
Diffstat (limited to 'engines/voyeur/graphics.cpp')
-rw-r--r--engines/voyeur/graphics.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/voyeur/graphics.cpp b/engines/voyeur/graphics.cpp
index 00d6c02d4e..55908334f6 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;
}