[Scummvm-git-logs] scummvm master -> 2c6b2532dd19d0ff268dc1c099f4bf18e86a42da

[dreammaster]

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:
2c6b2532dd TITANIC: Fix Satrfield crash using Tab without having inserted photo


Commit: 2c6b2532dd19d0ff268dc1c099f4bf18e86a42da
    https://github.com/scummvm/scummvm/commit/2c6b2532dd19d0ff268dc1c099f4bf18e86a42da
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-29T21:39:51-04:00

Commit Message:
TITANIC: Fix Satrfield crash using Tab without having inserted photo

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 0caa442..e02152d 100644
--- a/engines/titanic/star_control/star_view.cpp
+++ b/engines/titanic/star_control/star_view.cpp
@@ -334,6 +334,9 @@ void CStarView::fn9() {
 }
 
 void CStarView::toggleMode() {
+	if (!_photoSurface)
+		return;
+
 	_showingPhoto = !_showingPhoto;
 	if (_starField)
 		_starField->setMode(_showingPhoto ? MODE_PHOTO : MODE_STARFIELD);