(a00338777) v0.9.2.1

2019-08-26 19:58:19 +03:00
parent 0f63da27b2
commit 80698b58b0
311 changed files with 11763 additions and 4507 deletions
@@ -1251,6 +1251,7 @@ namespace Barotrauma
                if (!hoverArea.Contains(PlayerInput.MousePosition) || PlayerInput.RightButtonClicked())
                {
                    orderTargetFrame = null;
+                    OrderOptionButtons.Clear();
                }
            }
        }
@@ -1361,7 +1362,9 @@ namespace Barotrauma
            {
                reportButtonFrame.Visible = true;

-                var reportButtonParent = ChatBox ?? GameMain.Client.ChatBox;
+                var reportButtonParent = ChatBox ?? GameMain.Client?.ChatBox;
+                if (reportButtonParent == null) { return; }
+
                reportButtonFrame.RectTransform.AbsoluteOffset = new Point(
                    Math.Min(reportButtonParent.GUIFrame.Rect.X, reportButtonParent.ToggleButton.Rect.X) - reportButtonFrame.Rect.Width - (int)(10 * GUI.Scale),
                    reportButtonParent.GUIFrame.Rect.Y);