[Scummvm-git-logs] scummvm master -> d7ca6c3bc1a8cd053bada1d697371382deb0d687

[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:
d7ca6c3bc1 TITANIC: Fix crash opening GMM during startup & Continue dialog


Commit: d7ca6c3bc1a8cd053bada1d697371382deb0d687
    https://github.com/scummvm/scummvm/commit/d7ca6c3bc1a8cd053bada1d697371382deb0d687
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-28T21:45:07-04:00

Commit Message:
TITANIC: Fix crash opening GMM during startup & Continue dialog

Changed paths:
    engines/titanic/titanic.cpp


diff --git a/engines/titanic/titanic.cpp b/engines/titanic/titanic.cpp
index de28e07..67bdf82 100644
--- a/engines/titanic/titanic.cpp
+++ b/engines/titanic/titanic.cpp
@@ -191,7 +191,7 @@ bool TitanicEngine::canLoadGameStateCurrently() {
 		return false;
 	if (screenMan && screenMan->_inputHandler->isLocked())
 		return false;
-	if (!gameManager->isntTransitioning())
+	if (!gameManager || !gameManager->isntTransitioning())
 		return false;
 
 	CProjectItem *project = gameManager->_project;
@@ -210,6 +210,8 @@ bool TitanicEngine::canLoadGameStateCurrently() {
 
 bool TitanicEngine::canSaveGameStateCurrently() {
 	CGameManager *gameManager = _window->_gameManager;
+	if (!gameManager)
+		return false;
 
 	return gameManager->_gameState._petActive &&
 		canLoadGameStateCurrently();