[Scummvm-git-logs] scummvm master -> 8ad4c59c1ca3d595ca99b850a9c3db7efdc09e91

dreammaster dreammaster at scummvm.org
Sun May 28 23:15:53 CEST 2017


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:
8ad4c59c1c TITANIC: Fix crash switching from starfield to photo display


Commit: 8ad4c59c1ca3d595ca99b850a9c3db7efdc09e91
    https://github.com/scummvm/scummvm/commit/8ad4c59c1ca3d595ca99b850a9c3db7efdc09e91
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-05-28T17:14:48-04:00

Commit Message:
TITANIC: Fix crash switching from starfield to photo display

Changed paths:
    engines/titanic/star_control/star_view.cpp


diff --git a/engines/titanic/star_control/star_view.cpp b/engines/titanic/star_control/star_view.cpp
index 6890203..c98fb42 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");





More information about the Scummvm-git-logs mailing list