diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2024-08-15 00:43:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-15 00:43:24 +0200 |
| commit | f27724e902929b93ebf8a2388b10b87c6996a2c9 (patch) | |
| tree | d426c7ba069a9198718bab07f1be7b8876be7844 | |
| parent | 8e666adeed99328fda02e47429c8e45f36cd5ae1 (diff) | |
| parent | 16a563b9ac476114760d05f6359e843621225c67 (diff) | |
| download | redot-engine-f27724e902929b93ebf8a2388b10b87c6996a2c9.tar.gz | |
Merge pull request #95526 from alvinhochun/fix-pr94706
DisplayServerWindows: Fix logic when creating with transient parent
| -rw-r--r-- | platform/windows/display_server_windows.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index 7e368b4c1e..88ab9a4af0 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; + } } } |