From 8b5716f5383bb9760e8e56a31f4f38922a60c656 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 15 Jul 2015 18:52:28 -0400
Subject: SHERLOCK: Improve flagging for can load/save

---
 engines/sherlock/sherlock.cpp                     | 2 +-
 engines/sherlock/tattoo/tattoo_user_interface.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'engines/sherlock')

diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index d3a82d05fe..a0b45b8d5a 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 7d2b3cb649..469badabc7 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
-- 
cgit v1.2.3