[Scummvm-cvs-logs] scummvm master -> 86e9bb1f65171721aca3ccc086df29011effe3d0

dreammaster dreammaster at scummvm.org
Sat Aug 1 04:10:24 CEST 2015


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:
86e9bb1f65 SHERLOCK: RT: Fix closing Verbs menu by clicking outside it


Commit: 86e9bb1f65171721aca3ccc086df29011effe3d0
    https://github.com/scummvm/scummvm/commit/86e9bb1f65171721aca3ccc086df29011effe3d0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-31T22:09:23-04:00

Commit Message:
SHERLOCK: RT: Fix closing Verbs menu by clicking outside it

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



diff --git a/engines/sherlock/tattoo/widget_verbs.cpp b/engines/sherlock/tattoo/widget_verbs.cpp
index 3cdd124..7c9f723 100644
--- a/engines/sherlock/tattoo/widget_verbs.cpp
+++ b/engines/sherlock/tattoo/widget_verbs.cpp
@@ -196,10 +196,11 @@ void WidgetVerbs::handleEvents() {
 					// Call the Routine to turn on the Commands for this Object
 					load(!noDesc);
 				} else {
-					// Free the current menu graphics & erase the menu
+					// Close the window and clear the events
 					banishWindow();
+					events.clearEvents();
 
-					// See if we're in a Lab Table Room
+					// Reset the active UI mode
 					ui._menuMode = scene._labTableScene ? LAB_MODE : STD_MODE;
 				}
 			}






More information about the Scummvm-git-logs mailing list