summaryrefslogtreecommitdiff
path: root/platform/windows/os_windows.cpp
diff options
context:
space:
mode:
authorMax Hilbrunner <mhilbrunner@users.noreply.github.com>2018-05-28 16:00:21 +0200
committerGitHub <noreply@github.com>2018-05-28 16:00:21 +0200
commitfac0120521f1bf37dc7a8b86e67eb0754baee931 (patch)
tree972cb7473c3ac29c3702dca73b3a1180e34d5e13 /platform/windows/os_windows.cpp
parent4c5dd51eb9253478bfb5b106ea22a24f5b55133c (diff)
parentc8e0ec0580b16460372ae59a17b1b824eb5df4f1 (diff)
Merge pull request #19218 from guilhermefelipecgs/fix_invalid_image2
Change position of validation in set_custom_mouse_cursor
Diffstat (limited to 'platform/windows/os_windows.cpp')
-rw-r--r--platform/windows/os_windows.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index f013d1a6ad..aef1b8a595 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -2074,10 +2074,11 @@ void OS_Windows::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shap
ERR_FAIL_COND(!texture.is_valid());
ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256);
- ERR_FAIL_COND(!image.is_valid());
image = texture->get_data();
+ ERR_FAIL_COND(!image.is_valid());
+
UINT image_size = texture_size.width * texture_size.height;
UINT size = sizeof(UINT) * image_size;