Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 04:06:14 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #95526 from alvinhochun/fix-pr94706

Browse Source 
DisplayServerWindows: Fix logic when creating with transient parent
This commit is contained in:
Rémi Verschelde 2024-08-15 00:43:24 +02:00 committed by GitHub
commit f27724e902
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/windows/display_server_windows.cpp
View File

@ -5391,7 +5391,8 @@ DisplayServer::WindowID DisplayServerWindows::_create_window(WindowMode p_mode,
{ {
WindowData *wd_transient_parent = nullptr; WindowData *wd_transient_parent = nullptr;
HWND owner_hwnd = nullptr; HWND owner_hwnd = nullptr;
if (p_transient_parent != INVALID_WINDOW_ID && !windows.has(p_transient_parent)) { if (p_transient_parent != INVALID_WINDOW_ID) {
if (!windows.has(p_transient_parent)) {
ERR_PRINT("Condition \"!windows.has(p_transient_parent)\" is true."); ERR_PRINT("Condition \"!windows.has(p_transient_parent)\" is true.");
p_transient_parent = INVALID_WINDOW_ID; p_transient_parent = INVALID_WINDOW_ID;
} else { } else {
@ -5400,6 +5401,7 @@ DisplayServer::WindowID DisplayServerWindows::_create_window(WindowMode p_mode,
owner_hwnd = wd_transient_parent->hWnd; owner_hwnd = wd_transient_parent->hWnd;
} }
} }
}
WindowData &wd = windows[id]; WindowData &wd = windows[id];