aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Menshakov2009-11-09 08:23:19 +0000
committerVladimir Menshakov2009-11-09 08:23:19 +0000
commite9f2f2b291410af7a61d59e377e16e1bdf0172e9 (patch)
treedd4e9567ab86c06e45505ab5358b0c995da25079
parentdfc4dc6d85e5da9590e4647284fbc2c133f76fc9 (diff)
downloadscummvm-rg350-e9f2f2b291410af7a61d59e377e16e1bdf0172e9.tar.gz
scummvm-rg350-e9f2f2b291410af7a61d59e377e16e1bdf0172e9.tar.bz2
scummvm-rg350-e9f2f2b291410af7a61d59e377e16e1bdf0172e9.zip
do not trigger examine object while inventory is inactive
svn-id: r45773
-rw-r--r--engines/teenagent/inventory.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/teenagent/inventory.cpp b/engines/teenagent/inventory.cpp
index 70e58d5b24..0b9573dc36 100644
--- a/engines/teenagent/inventory.cpp
+++ b/engines/teenagent/inventory.cpp
@@ -152,8 +152,11 @@ bool Inventory::processEvent(const Common::Event &event) {
case Common::EVENT_LBUTTONDOWN: {
//check combine
+ if (!_active)
+ return false;
+
if (hovered_obj == NULL)
- return _active;
+ return true;
if (selected_obj == NULL) {
activate(false);