godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 19:41:11 +00:00
Code Releases Wiki Activity

Merge pull request #107498 from bruvzg/force_native_crash

Browse Source 
Fix `set_force_native` when window is not in tree.
This commit is contained in:
Rémi Verschelde
2025-06-13 18:37:52 +02:00
parent 3a2004905e 5ea0baab8b
commit 318a81779b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scene/main/window.cpp
View File

@@ -1370,7 +1370,7 @@ void Window::set_force_native(bool p_force_native) {
return;
}
force_native = p_force_native;
if (!is_in_edited_scene_root() && get_tree()->get_root()->is_embedding_subwindows()) {
if (!is_in_edited_scene_root() && is_inside_tree() && get_tree()->get_root()->is_embedding_subwindows()) {
set_embedding_subwindows(force_native);
}
}
@@ -1502,6 +1502,9 @@ void Window::_notification(int p_what) {
if (!ProjectSettings::get_singleton()->is_connected("settings_changed", callable_mp(this, &Window::_settings_changed))) {
ProjectSettings::get_singleton()->connect("settings_changed", callable_mp(this, &Window::_settings_changed));
}
} else if (get_parent() && get_tree()->get_root()->is_embedding_subwindows()) {
// Is not the main window and main window is embedding.
set_embedding_subwindows(force_native);
}
bool embedded = false;