[Scummvm-git-logs] scummvm master -> 4aabc56bb37a1564040094d5d8ea03f2f9b1d9fb

dreammaster dreammaster at scummvm.org
Wed Aug 23 03:20:11 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:
4aabc56bb3 TITANIC: Don't allow GMM loading in the middle of receiving mail


Commit: 4aabc56bb37a1564040094d5d8ea03f2f9b1d9fb
    https://github.com/scummvm/scummvm/commit/4aabc56bb37a1564040094d5d8ea03f2f9b1d9fb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-22T21:20:03-04:00

Commit Message:
TITANIC: Don't allow GMM loading in the middle of receiving mail

Changed paths:
    engines/titanic/titanic.cpp


diff --git a/engines/titanic/titanic.cpp b/engines/titanic/titanic.cpp
index b6ee868..f6c4c56 100644
--- a/engines/titanic/titanic.cpp
+++ b/engines/titanic/titanic.cpp
@@ -185,6 +185,8 @@ bool TitanicEngine::canLoadGameStateCurrently() {
 		return false;
 	if (screenMan && screenMan->_inputHandler->isLocked())
 		return false;
+	if (!gameManager->isntTransitioning())
+		return false;
 
 	CProjectItem *project = gameManager->_project;
 	if (project) {





More information about the Scummvm-git-logs mailing list