From 8a9467b09aab38649a891934c17a7b15608ddf0a Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 4 May 2015 13:22:43 -1000
Subject: SHERLOCK: Check _talkToAbort after calling pickupObject

---
 engines/sherlock/user_interface.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 93dd03316d..d40e1cced1 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -1508,6 +1508,7 @@ void UserInterface::doMiscControl(int allowed) {
 void UserInterface::doPickControl() {
 	Events &events = *_vm->_events;
 	Scene &scene = *_vm->_scene;
+	Talk &talk = *_vm->_talk;
 
 	if (events._released) {
 		if ((_temp = _bgFound) != -1) {
@@ -1517,7 +1518,7 @@ void UserInterface::doPickControl() {
 			if (_bgFound < 1000) {
 				scene._bgShapes[_bgFound].pickUpObject(MPICK);
 
-				if (_menuMode != TALK_MODE) {
+				if (!talk._talkToAbort && _menuMode != TALK_MODE) {
 					_key = _oldKey = -1;
 					_menuMode = STD_MODE;
 					restoreButton(PICKUP_MODE - 1);
-- 
cgit v1.2.3