From ee81979f901e096fab84109b3e66aa1238d1abd2 Mon Sep 17 00:00:00 2001 From: Anton Christoffersson Date: Sat, 23 Oct 2021 12:48:43 +0200 Subject: Fixed crash in `ScrollContainer` _notification --- scene/gui/scroll_container.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scene/gui') diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp index 0c0ec39c7f..6e1e1bb5ea 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -320,7 +320,9 @@ void ScrollContainer::_notification(int p_what) { }; if (p_what == NOTIFICATION_READY) { - get_viewport()->connect("gui_focus_changed", callable_mp(this, &ScrollContainer::_gui_focus_changed)); + Viewport* viewport = get_viewport(); + ERR_FAIL_COND(!viewport); + viewport->connect("gui_focus_changed", callable_mp(this, &ScrollContainer::_gui_focus_changed)); _update_dimensions(); } -- cgit v1.2.3