From bc7127c52222fc98c36f6b33b534acdcb10027c8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 3 Jun 2015 19:10:33 -0400
Subject: SHERLOCK: Fix resetting cursor when leaving the map

---
 engines/sherlock/events.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/sherlock/events.cpp b/engines/sherlock/events.cpp
index ec6863c2a8..afd3602758 100644
--- a/engines/sherlock/events.cpp
+++ b/engines/sherlock/events.cpp
@@ -62,8 +62,6 @@ void Events::setCursor(CursorId cursorId) {
 	if (cursorId == _cursorId)
 		return;
 
-	_cursorId = cursorId;
-
 	int hotspotX, hotspotY;
 
 	if (cursorId == MAGNIFY) {
@@ -78,9 +76,12 @@ void Events::setCursor(CursorId cursorId) {
 	Graphics::Surface &s = (*_cursorImages)[cursorId]._frame;
 
 	setCursor(s, hotspotX, hotspotY);
+
+	_cursorId = cursorId;
 }
 
 void Events::setCursor(const Graphics::Surface &src, int hotspotX, int hotspotY) {
+	_cursorId = INVALID_CURSOR;
 	CursorMan.replaceCursor(src.getPixels(), src.w, src.h, hotspotX, hotspotY, 0xff);
 	showCursor();
 }
-- 
cgit v1.2.3