[Scummvm-git-logs] scummvm master -> f827e27bfbc0538f68e636798626dde60c19fadb
dreammaster
dreammaster at scummvm.org
Sun Jun 18 21:49:30 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:
f827e27bfb TITANIC: Fix crash clicking mouse when copyright dialog is showing
Commit: f827e27bfbc0538f68e636798626dde60c19fadb
https://github.com/scummvm/scummvm/commit/f827e27bfbc0538f68e636798626dde60c19fadb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-06-18T15:49:19-04:00
Commit Message:
TITANIC: Fix crash clicking mouse when copyright dialog is showing
Changed paths:
engines/titanic/main_game_window.cpp
diff --git a/engines/titanic/main_game_window.cpp b/engines/titanic/main_game_window.cpp
index 41ccd6d..9fdeac3 100644
--- a/engines/titanic/main_game_window.cpp
+++ b/engines/titanic/main_game_window.cpp
@@ -363,6 +363,9 @@ void CMainGameWindow::keyDown(Common::KeyState keyState) {
}
bool CMainGameWindow::isMouseControlEnabled() const {
+ if (!_gameManager)
+ return false;
+
CScreenManager *screenMan = CScreenManager::_screenManagerPtr;
if (!screenMan || !screenMan->_mouseCursor)
return true;
More information about the Scummvm-git-logs
mailing list