From 0a679a0a7f5f1c0b6454c75554d20330e88516c7 Mon Sep 17 00:00:00 2001
From: Lukas Stark <lukst346@student.liu.se>
Date: Sat, 1 Nov 2025 22:55:41 +0100
Subject: [PATCH] [windows] Added early return for when toggling borderless
 while fullscreen

---
 platform/windows/display_server_windows.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp
index cd6633f6669..e3ff40f9016 100644
--- a/platform/windows/display_server_windows.cpp
+++ b/platform/windows/display_server_windows.cpp
@@ -2623,6 +2623,9 @@ void DisplayServerWindows::window_set_flag(WindowFlags p_flag, bool p_enabled, W
 		} break;
 		case WINDOW_FLAG_BORDERLESS: {
 			wd.borderless = p_enabled;
+			if (wd.fullscreen) {
+				return;
+			}
 			_update_window_mouse_passthrough(p_window);
 			_update_window_style(p_window);
 			ShowWindow(wd.hWnd, (wd.no_focus || wd.is_popup) ? SW_SHOWNOACTIVATE : SW_SHOW); // Show the window.