From fc1d1c3557de3339d18df2639e12edca33a774a5 Mon Sep 17 00:00:00 2001
From: bruvzg <7645683+bruvzg@users.noreply.github.com>
Date: Mon, 22 Jun 2020 13:05:18 +0300
Subject: [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.

---
 platform/windows/display_server_windows.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp
index 7cb6e90edb..f47afcc4e5 100644
--- a/platform/windows/display_server_windows.cpp
+++ b/platform/windows/display_server_windows.cpp
@@ -103,7 +103,11 @@ void DisplayServerWindows::_set_mouse_mode_impl(MouseMode p_mode) {
 	}
 
 	if (p_mode == MOUSE_MODE_CAPTURED || p_mode == MOUSE_MODE_HIDDEN) {
-		hCursor = SetCursor(nullptr);
+		if (hCursor == nullptr) {
+			hCursor = SetCursor(nullptr);
+		} else {
+			SetCursor(nullptr);
+		}
 	} else {
 		CursorShape c = cursor_shape;
 		cursor_shape = CURSOR_MAX;
@@ -117,9 +121,9 @@ void DisplayServerWindows::mouse_set_mode(MouseMode p_mode) {
 	if (mouse_mode == p_mode)
 		return;
 
-	_set_mouse_mode_impl(p_mode);
-
 	mouse_mode = p_mode;
+
+	_set_mouse_mode_impl(p_mode);
 }
 
 DisplayServer::MouseMode DisplayServerWindows::mouse_get_mode() const {
@@ -2654,10 +2658,11 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 			if (LOWORD(lParam) == HTCLIENT) {
 				if (windows[window_id].window_has_focus && (mouse_mode == MOUSE_MODE_HIDDEN || mouse_mode == MOUSE_MODE_CAPTURED)) {
 					//Hide the cursor
-					if (hCursor == nullptr)
+					if (hCursor == nullptr) {
 						hCursor = SetCursor(nullptr);
-					else
+					} else {
 						SetCursor(nullptr);
+					}
 				} else {
 					if (hCursor != nullptr) {
 						CursorShape c = cursor_shape;
-- 
cgit v1.2.3