(a8b3957c6) Fixed nullref exception when selecting categories in the sub editor

2019-05-03 13:44:38 +03:00
parent c988016b6f
commit 16e49d10d9
5 changed files with 50 additions and 301 deletions
@@ -320,7 +320,7 @@ namespace Barotrauma
            entityCategoryButtons.Add(
                new GUIButton(new RectTransform(new Vector2(1.0f, 1.0f), tabButtonHolder.RectTransform), TextManager.Get("MapEntityCategory.All"), style: "GUITabButton")
                {
-                    OnClicked = (btn, userdata) => { ClearFilter(); return true; }
+                    OnClicked = (btn, userdata) => { entityCategoryButtons.ForEach(b => b.Selected = b == btn); ClearFilter(); return true; }
                });

            foreach (MapEntityCategory category in Enum.GetValues(typeof(MapEntityCategory)))
@@ -1492,7 +1492,9 @@ namespace Barotrauma
            ClearFilter();
            foreach (GUIButton button in entityCategoryButtons)
            {
-                button.Selected = (MapEntityCategory)button.UserData == selectedCategory;
+                button.Selected = 
+                    button.UserData != null &&
+                    (MapEntityCategory)button.UserData == selectedCategory;
            }
            
            foreach (GUIComponent child in toggleEntityMenuButton.Children)