Browse Source

Merge pull request #19218 from guilhermefelipecgs/fix_invalid_image2

Change position of validation in set_custom_mouse_cursor
Max Hilbrunner 7 years ago
parent
commit
fac0120521
3 changed files with 6 additions and 3 deletions
  1. 2 1
      platform/osx/os_osx.mm
  2. 2 1
      platform/windows/os_windows.cpp
  3. 2 1
      platform/x11/os_x11.cpp

+ 2 - 1
platform/osx/os_osx.mm

@@ -1543,10 +1543,11 @@ void OS_OSX::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, c
 
 		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());
+
 		NSBitmapImageRep *imgrep = [[NSBitmapImageRep alloc]
 				initWithBitmapDataPlanes:NULL
 							  pixelsWide:int(texture_size.width)

+ 2 - 1
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;
 

+ 2 - 1
platform/x11/os_x11.cpp

@@ -2449,10 +2449,11 @@ void OS_X11::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, c
 
 		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());
+
 		// Create the cursor structure
 		XcursorImage *cursor_image = XcursorImageCreate(texture_size.width, texture_size.height);
 		XcursorUInt image_size = texture_size.width * texture_size.height;