[Scummvm-git-logs] scummvm master -> 4d2da628dfb9d84108df805c0a320065087b00b9

[npjg]

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:
4d2da628df GRAPHICS: MACGUI: Set WM cursor visible on cursor pop


Commit: 4d2da628dfb9d84108df805c0a320065087b00b9
    https://github.com/scummvm/scummvm/commit/4d2da628dfb9d84108df805c0a320065087b00b9
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-20T16:49:11-04:00

Commit Message:
GRAPHICS: MACGUI: Set WM cursor visible on cursor pop

Changed paths:
    graphics/macgui/macwindowmanager.cpp


diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index a135ec50de..9f1c3c029f 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -647,9 +647,6 @@ void MacWindowManager::pushWatchCursor() {
 }
 
 void MacWindowManager::pushCursor(MacCursorType type, Cursor *cursor) {
-	if (_cursorType == kMacCursorOff && _cursorType != type)
-		CursorMan.showMouse(true);
-
 	switch (type) {
 	case kMacCursorOff:
 		CursorMan.showMouse(false);
@@ -682,9 +679,6 @@ void MacWindowManager::pushCursor(MacCursorType type, Cursor *cursor) {
 }
 
 void MacWindowManager::replaceCursor(MacCursorType type, Cursor *cursor) {
-	if (_cursorType == kMacCursorOff && _cursorType != type)
-		CursorMan.showMouse(true);
-
 	switch (type) {
 	case kMacCursorOff:
 		CursorMan.showMouse(false);
@@ -733,8 +727,12 @@ void MacWindowManager::pushCustomCursor(const Graphics::Cursor *cursor) {
 }
 
 void MacWindowManager::popCursor() {
-	CursorMan.popCursor();
-	CursorMan.popCursorPalette();
+	if (_cursorType == kMacCursorOff) {
+		CursorMan.showMouse(true);
+	} else {
+		CursorMan.popCursor();
+		CursorMan.popCursorPalette();
+	}
 }
 
 ///////////////////