[Scummvm-git-logs] scummvm master -> 8ab13e59e18bf1b757a54518d22b45b644e5ebd3

[sluicebox]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8ab13e59e1 SCI32: Fix Mac cursor when resource doesn't exist


Commit: 8ab13e59e18bf1b757a54518d22b45b644e5ebd3
    https://github.com/scummvm/scummvm/commit/8ab13e59e18bf1b757a54518d22b45b644e5ebd3
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-04-21T21:29:51-07:00

Commit Message:
SCI32: Fix Mac cursor when resource doesn't exist

Fixes Phantasmagoria cursor disappearing when viewing inventory

Changed paths:
    engines/sci/graphics/maccursor32.cpp


diff --git a/engines/sci/graphics/maccursor32.cpp b/engines/sci/graphics/maccursor32.cpp
index d17b381164..8484db5843 100644
--- a/engines/sci/graphics/maccursor32.cpp
+++ b/engines/sci/graphics/maccursor32.cpp
@@ -34,8 +34,6 @@ void GfxMacCursor32::setMacCursorRemapList(int cursorCount, reg_t *cursors) {
 }
 
 void GfxMacCursor32::setView(const GuiResourceId viewId, const int16 loopNo, const int16 celNo) {
-	hide();
-
 	_cursorInfo.resourceId = viewId;
 	_cursorInfo.loopNo = loopNo;
 	_cursorInfo.celNo = celNo;
@@ -68,6 +66,8 @@ void GfxMacCursor32::setView(const GuiResourceId viewId, const int16 loopNo, con
 		return;
 	}
 
+	hide();
+
 	CursorMan.disableCursorPalette(false);
 	CursorMan.replaceCursor(macCursor);