From d1993773880143d234f3355dd5a03f778e35b78c Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Sun, 13 Jun 2010 07:35:48 +0000
Subject: When closing inventory, do not force input back to game-mode if
 commands need otherwise.

svn-id: r49623
---
 engines/parallaction/input.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'engines/parallaction/input.cpp')

diff --git a/engines/parallaction/input.cpp b/engines/parallaction/input.cpp
index d6dd9feb19..6d3f6f0b04 100644
--- a/engines/parallaction/input.cpp
+++ b/engines/parallaction/input.cpp
@@ -395,7 +395,7 @@ void Input::exitInventoryMode() {
 			_vm->dropItem(z->u._mergeObj1);
 			_vm->dropItem(z->u._mergeObj2);
 			_vm->addInventoryItem(z->u._mergeObj3);
-			_vm->_cmdExec->run(z->_commands);
+			_vm->_cmdExec->run(z->_commands);	// commands might set a new _inputMode
 		}
 
 	}
@@ -412,7 +412,11 @@ void Input::exitInventoryMode() {
 	}
 	_vm->resumeJobs();
 
-	_inputMode = kInputModeGame;
+	// in case the input mode was not changed by the code above (especially by the commands
+	// executed in case of a merge), then assume we are going back to game mode
+	if (_inputMode == kInputModeInventory) {
+		_inputMode = kInputModeGame;
+	}
 }
 
 bool Input::updateInventoryInput() {
-- 
cgit v1.2.3