Merge https://github.com/Regalis11/Barotrauma into develop

2023-04-12 11:44:22 -03:00
parent ee7ca80d88 f223f774b9
commit e2a70f3b4a
14 changed files with 65 additions and 39 deletions
@@ -811,6 +811,7 @@ namespace Barotrauma
                    IEnumerable<GUITextBox> GetAndSortTextBoxes(GUIComponent parent) => parent.GetAllChildren<GUITextBox>().OrderBy(t => t.Rect.Y).ThenBy(t => t.Rect.X);
                    GUITextBox SelectNextTextBox(GUIListBox listBox)
                    {
+                        if (listBox?.SelectedComponent == null) { return null; }
                        var textBoxes = GetAndSortTextBoxes(listBox.SelectedComponent);
                        if (textBoxes.Any())
                        {