(1986bc0d3) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-06-11 21:46:21 +03:00
parent dd1ce8bf2f
commit 5f497543a4
9 changed files with 154 additions and 77 deletions
@@ -148,7 +148,7 @@ namespace Barotrauma
            //find the parent GUIListBox highest in the hierarchy
            for (int i = parentHierarchy.Count - 1; i >= 0; i--)
            {
-                if (parentHierarchy[i].GUIComponent is GUIListBox) return parentHierarchy[i];
+                if (parentHierarchy[i].GUIComponent is GUIListBox) return parentHierarchy[i]?.Parent ?? parentHierarchy[i];
            }
            //or just go with the direct parent if there are no listboxes in the hierarchy
            parentHierarchy.Clear();