aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2017-05-28 17:14:48 -0400
committerPaul Gilbert2017-05-28 17:14:48 -0400
commit8ad4c59c1ca3d595ca99b850a9c3db7efdc09e91 (patch)
treeea675c020dbc5a58813d3a7dbbefdd952239d25c
parent6587cacabd0ccf4414ab1e4e72ab33897b44e441 (diff)
downloadscummvm-rg350-8ad4c59c1ca3d595ca99b850a9c3db7efdc09e91.tar.gz
scummvm-rg350-8ad4c59c1ca3d595ca99b850a9c3db7efdc09e91.tar.bz2
scummvm-rg350-8ad4c59c1ca3d595ca99b850a9c3db7efdc09e91.zip
TITANIC: Fix crash switching from starfield to photo display
-rw-r--r--engines/titanic/star_control/star_view.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/titanic/star_control/star_view.cpp b/engines/titanic/star_control/star_view.cpp
index 689020342e..c98fb42f42 100644
--- a/engines/titanic/star_control/star_view.cpp
+++ b/engines/titanic/star_control/star_view.cpp
@@ -87,7 +87,8 @@ void CStarView::draw(CScreenManager *screenManager) {
Point destPos(20, 10);
if (_showingPhoto) {
- screenManager->blitFrom(SURFACE_PRIMARY, _photoSurface, &destPos);
+ if (_photoSurface)
+ screenManager->blitFrom(SURFACE_PRIMARY, _photoSurface, &destPos);
if (!_homePhotoMask && _owner) {
_homePhotoMask = _owner->getHiddenObject("HomePhotoMask");