From 5d416e7903cd6fb6efa7e6dbdd0bd91aa3fc4de0 Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Fri, 12 Aug 2011 20:57:38 +0200
Subject: COMPOSER: Don't ignore setCursorVisible when there's no cursor yet.

---
 engines/composer/composer.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'engines/composer/composer.cpp')

diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp
index cf773dc2dc..11bf8e8900 100644
--- a/engines/composer/composer.cpp
+++ b/engines/composer/composer.cpp
@@ -253,16 +253,15 @@ void ComposerEngine::setCursor(uint16 id, const Common::Point &offset) {
 }
 
 void ComposerEngine::setCursorVisible(bool visible) {
-	if (!_mouseSpriteId)
-		return;
-
 	if (visible && !_mouseVisible) {
 		_mouseVisible = true;
-		addSprite(_mouseSpriteId, 0, 0, _lastMousePos - _mouseOffset);
+		if (_mouseSpriteId)
+			addSprite(_mouseSpriteId, 0, 0, _lastMousePos - _mouseOffset);
 		onMouseMove(_lastMousePos);
 	} else if (!visible && _mouseVisible) {
 		_mouseVisible = false;
-		removeSprite(_mouseSpriteId, 0);
+		if (_mouseSpriteId)
+			removeSprite(_mouseSpriteId, 0);
 	}
 }
 
-- 
cgit v1.2.3