Browse Source

Merge pull request #47115 from jcsho/fix-tree-null-stylebox

Check for null pointer in get_column_width(0)
Rémi Verschelde 4 years ago
parent
commit
8a7e503337
1 changed files with 5 additions and 1 deletions
  1. 5 1
      scene/gui/tree.cpp

+ 5 - 1
scene/gui/tree.cpp

@@ -3506,9 +3506,13 @@ int Tree::get_column_width(int p_column) const {
 		return columns[p_column].min_width;
 	}
 
+	int expand_area = get_size().width;
+
 	Ref<StyleBox> bg = cache.bg;
 
-	int expand_area = get_size().width - (bg->get_margin(SIDE_LEFT) + bg->get_margin(SIDE_RIGHT));
+	if (bg.is_valid()) {
+		expand_area -= bg->get_margin(SIDE_LEFT) + bg->get_margin(SIDE_RIGHT);
+	}
 
 	if (v_scroll->is_visible_in_tree()) {
 		expand_area -= v_scroll->get_combined_minimum_size().width;