summaryrefslogtreecommitdiff
path: root/platform/windows
diff options
context:
space:
mode:
authorGuilherme Felipe <guilhermefelipecgs@gmail.com>2018-09-13 14:53:20 -0300
committerGuilherme Felipe <guilhermefelipecgs@gmail.com>2018-09-13 15:13:57 -0300
commit04aef23585376c3e648c086e39a58e7f5fd41f7d (patch)
treec84e962f26bca403c1324487b2e091c82091e5f5 /platform/windows
parentbcba5a99cdb2debcd9a595a4e9e905809f65da10 (diff)
Fix set_custom_mouse_cursor changing to incorrect cursor shape
[Docs] Add class ref for Input::set_default_cursor_shape
Diffstat (limited to 'platform/windows')
-rw-r--r--platform/windows/os_windows.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 67fc1c7496..f63aebbbd3 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -2311,7 +2311,7 @@ void OS_Windows::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shap
cursors[p_shape] = CreateIconIndirect(&iconinfo);
- if (p_shape == CURSOR_ARROW) {
+ if (p_shape == cursor_shape) {
SetCursor(cursors[p_shape]);
}
@@ -2328,8 +2328,10 @@ void OS_Windows::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shap
} else {
// Reset to default system cursor
cursors[p_shape] = NULL;
+
+ CursorShape c = cursor_shape;
cursor_shape = CURSOR_MAX;
- set_cursor_shape(p_shape);
+ set_cursor_shape(c);
}
}