From 16a563b9ac476114760d05f6359e843621225c67 Mon Sep 17 00:00:00 2001 From: Alvin Wong Date: Thu, 15 Aug 2024 04:07:08 +0800 Subject: [PATCH] DisplayServerWindows: Fix logic when creating with transient parent --- platform/windows/display_server_windows.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index 7e368b4c1ed0..88ab9a4af087 100644 --- a/platform/windows/display_server_windows.cpp +++ b/platform/windows/display_server_windows.cpp @@ -5391,13 +5391,15 @@ DisplayServer::WindowID DisplayServerWindows::_create_window(WindowMode p_mode, { WindowData *wd_transient_parent = nullptr; HWND owner_hwnd = nullptr; - if (p_transient_parent != INVALID_WINDOW_ID && !windows.has(p_transient_parent)) { - ERR_PRINT("Condition \"!windows.has(p_transient_parent)\" is true."); - p_transient_parent = INVALID_WINDOW_ID; - } else { - wd_transient_parent = &windows[p_transient_parent]; - if (p_exclusive) { - owner_hwnd = wd_transient_parent->hWnd; + if (p_transient_parent != INVALID_WINDOW_ID) { + if (!windows.has(p_transient_parent)) { + ERR_PRINT("Condition \"!windows.has(p_transient_parent)\" is true."); + p_transient_parent = INVALID_WINDOW_ID; + } else { + wd_transient_parent = &windows[p_transient_parent]; + if (p_exclusive) { + owner_hwnd = wd_transient_parent->hWnd; + } } }