From a41932575306f7bf38623a0de219b9f6ab130149 Mon Sep 17 00:00:00 2001 From: Ninni Pipping Date: Mon, 6 Mar 2023 22:00:34 +0100 Subject: [PATCH] Fix clearing custom cursor --- platform/linuxbsd/x11/display_server_x11.cpp | 4 ++-- platform/macos/display_server_macos.mm | 4 ++-- platform/windows/display_server_windows.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/linuxbsd/x11/display_server_x11.cpp b/platform/linuxbsd/x11/display_server_x11.cpp index d1f1115aad3..afb766e2863 100644 --- a/platform/linuxbsd/x11/display_server_x11.cpp +++ b/platform/linuxbsd/x11/display_server_x11.cpp @@ -2714,11 +2714,11 @@ void DisplayServerX11::cursor_set_custom_image(const Ref &p_cursor, Cu cursors[p_shape] = XcursorImageLoadCursor(x11_display, img[p_shape]); } + cursors_cache.erase(p_shape); + CursorShape c = current_cursor; current_cursor = CURSOR_MAX; cursor_set_shape(c); - - cursors_cache.erase(p_shape); } } diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm index e8eb5b419b2..440b34f2eaf 100644 --- a/platform/macos/display_server_macos.mm +++ b/platform/macos/display_server_macos.mm @@ -3389,9 +3389,9 @@ void DisplayServerMacOS::cursor_set_custom_image(const Ref &p_cursor, cursors[p_shape] = nullptr; } - cursor_update_shape(); - cursors_cache.erase(p_shape); + + cursor_update_shape(); } } diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index 360e446de77..92e78133f56 100644 --- a/platform/windows/display_server_windows.cpp +++ b/platform/windows/display_server_windows.cpp @@ -1842,11 +1842,11 @@ void DisplayServerWindows::cursor_set_custom_image(const Ref &p_cursor } cursors[p_shape] = nullptr; + cursors_cache.erase(p_shape); + CursorShape c = cursor_shape; cursor_shape = CURSOR_MAX; cursor_set_shape(c); - - cursors_cache.erase(p_shape); } }