Merge pull request #79937 from Sauermann/fix-expected-safe-rect-error

Disable error condition for accessing safe rect
godotengine · Jul 27, 2023 · 08e1a69 · 08e1a69
2 parents 7a9a0dc + 7fead97
commit 08e1a69
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
@@ -3510,7 +3510,12 @@ void Viewport::subwindow_set_popup_safe_rect(Window *p_window, const Rect2i &p_r
 
 Rect2i Viewport::subwindow_get_popup_safe_rect(Window *p_window) const {
 	int index = _sub_window_find(p_window);
-	ERR_FAIL_COND_V(index == -1, Rect2i());
+	// FIXME: Re-enable ERR_FAIL_COND after rewriting embedded window popup closing.
+	// Currently it is expected, that index == -1 can happen.
+	if (index == -1) {
+		return Rect2i();
+	}
+	// ERR_FAIL_COND_V(index == -1, Rect2i());
 
 	return gui.sub_windows[index].parent_safe_rect;
 }