[Scummvm-cvs-logs] scummvm master -> 9f74d342a87da25c96550f2528e0eab67eb6897a

[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:
9f74d342a8 SHERLOCK: RT: Fix saving in the lab table scene


Commit: 9f74d342a87da25c96550f2528e0eab67eb6897a
    https://github.com/scummvm/scummvm/commit/9f74d342a87da25c96550f2528e0eab67eb6897a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-02T18:53:03-04:00

Commit Message:
SHERLOCK: RT: Fix saving in the lab table scene

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 18b9332..17acfcd 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -191,7 +191,7 @@ void SherlockEngine::sceneLoop() {
 }
 
 void SherlockEngine::handleInput() {
-	_canLoadSave = _ui->_menuMode == STD_MODE;
+	_canLoadSave = _ui->_menuMode == STD_MODE || _ui->_menuMode == LAB_MODE;
 	_events->pollEventsAndWait();
 	_canLoadSave = false;
 
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index 5b56c94..dda46de 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -246,9 +246,6 @@ 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 for credits starting