Browse Source

[Windows] Prevent overwriting old cursor handle on multiple mouse_mode changes, ensure mouse_mode is set before `cursor_set_shape` is called to restore cursor.

(cherry picked from commit fc1d1c3557de3339d18df2639e12edca33a774a5)
bruvzg 5 years ago
parent
commit
1468c0b4d4
1 changed files with 10 additions and 5 deletions
  1. 10 5
      platform/windows/os_windows.cpp

+ 10 - 5
platform/windows/os_windows.cpp

@@ -1186,10 +1186,11 @@ LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 			if (LOWORD(lParam) == HTCLIENT) {
 			if (LOWORD(lParam) == HTCLIENT) {
 				if (window_has_focus && (mouse_mode == MOUSE_MODE_HIDDEN || mouse_mode == MOUSE_MODE_CAPTURED)) {
 				if (window_has_focus && (mouse_mode == MOUSE_MODE_HIDDEN || mouse_mode == MOUSE_MODE_CAPTURED)) {
 					//Hide the cursor
 					//Hide the cursor
-					if (hCursor == NULL)
+					if (hCursor == NULL) {
 						hCursor = SetCursor(NULL);
 						hCursor = SetCursor(NULL);
-					else
+					} else {
 						SetCursor(NULL);
 						SetCursor(NULL);
+					}
 				} else {
 				} else {
 					if (hCursor != NULL) {
 					if (hCursor != NULL) {
 						CursorShape c = cursor_shape;
 						CursorShape c = cursor_shape;
@@ -1864,9 +1865,9 @@ void OS_Windows::set_mouse_mode(MouseMode p_mode) {
 	if (mouse_mode == p_mode)
 	if (mouse_mode == p_mode)
 		return;
 		return;
 
 
-	_set_mouse_mode_impl(p_mode);
-
 	mouse_mode = p_mode;
 	mouse_mode = p_mode;
+
+	_set_mouse_mode_impl(p_mode);
 }
 }
 
 
 void OS_Windows::_set_mouse_mode_impl(MouseMode p_mode) {
 void OS_Windows::_set_mouse_mode_impl(MouseMode p_mode) {
@@ -1890,7 +1891,11 @@ void OS_Windows::_set_mouse_mode_impl(MouseMode p_mode) {
 	}
 	}
 
 
 	if (p_mode == MOUSE_MODE_CAPTURED || p_mode == MOUSE_MODE_HIDDEN) {
 	if (p_mode == MOUSE_MODE_CAPTURED || p_mode == MOUSE_MODE_HIDDEN) {
-		hCursor = SetCursor(NULL);
+		if (hCursor == NULL) {
+			hCursor = SetCursor(NULL);
+		} else {
+			SetCursor(NULL);
+		}
 	} else {
 	} else {
 		CursorShape c = cursor_shape;
 		CursorShape c = cursor_shape;
 		cursor_shape = CURSOR_MAX;
 		cursor_shape = CURSOR_MAX;