From 62db47a7fb110e2a9fd9c87997ba350b19604346 Mon Sep 17 00:00:00 2001
From: Anton Christoffersson <anton_christoffersson@hotmail.com>
Date: Sat, 23 Oct 2021 12:48:43 +0200
Subject: [PATCH] Fixed crash in `ScrollContainer` _notification

(cherry picked from commit ee81979f901e096fab84109b3e66aa1238d1abd2)
---
 scene/gui/scroll_container.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp
index bdee066d579..e88d26aba78 100644
--- a/scene/gui/scroll_container.cpp
+++ b/scene/gui/scroll_container.cpp
@@ -257,7 +257,9 @@ void ScrollContainer::_notification(int p_what) {
 	};
 
 	if (p_what == NOTIFICATION_READY) {
-		get_viewport()->connect("gui_focus_changed", this, "_gui_focus_changed");
+		Viewport *viewport = get_viewport();
+		ERR_FAIL_COND(!viewport);
+		viewport->connect("gui_focus_changed", this, "_gui_focus_changed");
 	}
 
 	if (p_what == NOTIFICATION_SORT_CHILDREN) {