Browse Source

Merge pull request #54148 from miraz12/fix-scrollContrainer-notification-crash

Rémi Verschelde 3 years ago
parent
commit
1edbe4f3c1
1 changed files with 3 additions and 1 deletions
  1. 3 1
      scene/gui/scroll_container.cpp

+ 3 - 1
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();
 	}