Merge pull request godotengine#90637 from aaronp64/force_native_crash

akien-mga · akien-mga · commit 88033ea8c685 · 2024-04-15T10:00:29.000+02:00
Fix `Window.hide()` crash when `force_native` changes
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
@@ -1215,10 +1215,10 @@ void Window::set_force_native(bool p_force_native) {
 	if (force_native == p_force_native) {
 		return;
 	}
-	force_native = p_force_native;
 	if (is_visible() && !is_in_edited_scene_root()) {
-		WARN_PRINT("Can't change \"force_native\" while a window is displayed. Consider hiding window before changing this value.");
+		ERR_FAIL_MSG("Can't change \"force_native\" while a window is displayed. Consider hiding window before changing this value.");
 	}
+	force_native = p_force_native;
 }
 
 bool Window::get_force_native() const {

Original file line number	Diff line number	Diff line change
`@@ -1215,10 +1215,10 @@ void Window::set_force_native(bool p_force_native) {`
`1215`	`1215`	`if (force_native == p_force_native) {`
`1216`	`1216`	`return;`
`1217`	`1217`	`}`
`1218`		`- force_native = p_force_native;`
`1219`	`1218`	`if (is_visible() && !is_in_edited_scene_root()) {`
`1220`		`- WARN_PRINT("Can't change \"force_native\" while a window is displayed. Consider hiding window before changing this value.");`
	`1219`	`+ ERR_FAIL_MSG("Can't change \"force_native\" while a window is displayed. Consider hiding window before changing this value.");`
`1221`	`1220`	`}`
	`1221`	`+ force_native = p_force_native;`
`1222`	`1222`	`}`
`1223`	`1223`
`1224`	`1224`	`bool Window::get_force_native() const {`