[Scummvm-cvs-logs] scummvm master -> 8b5716f5383bb9760e8e56a31f4f38922a60c656

[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:
8b5716f538 SHERLOCK: Improve flagging for can load/save


Commit: 8b5716f5383bb9760e8e56a31f4f38922a60c656
    https://github.com/scummvm/scummvm/commit/8b5716f5383bb9760e8e56a31f4f38922a60c656
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-15T18:52:28-04:00

Commit Message:
SHERLOCK: Improve flagging for can load/save

Changed paths:
    engines/sherlock/sherlock.cpp
    engines/sherlock/tattoo/tattoo_user_interface.cpp



diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index d3a82d0..a0b45b8 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -191,7 +191,7 @@ void SherlockEngine::sceneLoop() {
 }
 
 void SherlockEngine::handleInput() {
-	_canLoadSave = true;
+	_canLoadSave = _ui->_menuMode == STD_MODE;
 	_events->pollEventsAndWait();
 	_canLoadSave = false;
 
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index 7d2b3cb..469bada 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -232,7 +232,9 @@ void TattooUserInterface::handleInput() {
 	TattooScene &scene = *(TattooScene *)_vm->_scene;
 	Common::Point mousePos = events.mousePos();
 
+	_vm->_canLoadSave = _menuMode == STD_MODE;
 	events.pollEventsAndWait();
+	_vm->_canLoadSave = false;
 	_keyState.keycode = Common::KEYCODE_INVALID;
 
 	// Check the mouse positioning