From 197409da40b2a7a4064edf05ecf5f520faef8eea Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 9 Sep 2011 22:10:03 +1000
Subject: LURE: Fix crash caused by trying to talk to a character when an ask
 action is in progress

---
 engines/lure/hotspots.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index f38bac6e12..96e5e088ab 100644
--- a/engines/lure/hotspots.cpp
+++ b/engines/lure/hotspots.cpp
@@ -1673,6 +1673,12 @@ void Hotspot::doTalkTo(HotspotData *hotspot) {
 	faceHotspot(hotspot);
 	endAction();
 
+	// WORKAROUND: Fix crash when talking when an ask conversation is active
+	if (_data->talkDestCharacterId != 0) {
+		// Don't allow the talk to start
+		return;
+	}
+
 	uint16 sequenceOffset = res.getHotspotAction(hotspot->actionsOffset, TALK_TO);
 	if (sequenceOffset >= 0x8000) {
 		showMessage(sequenceOffset);
-- 
cgit v1.2.3