Unstable v0.10.600.0

2020-10-01 12:19:24 -03:00
parent 20a69375ca
commit ebe1ce1427
217 changed files with 4284 additions and 1547 deletions
@@ -1169,7 +1169,7 @@ namespace Barotrauma

            Character.Controlled = null;
            GameMain.LightManager.LosEnabled = false;
-
+            GUI.PreventPauseMenuToggle = false;
            CampaignCharacterDiscarded = false;

            chatInput.Select();
@@ -2799,7 +2799,7 @@ namespace Barotrauma
                        var variantButton = CreateJobVariantButton(jobPrefab, variantIndex, images.Length, jobButton);
                        variantButton.OnClicked = (btn, obj) =>
                        {
-                            currSelected.Selected = false;
+                            if (currSelected != null) { currSelected.Selected = false; }
                            int k = ((Pair<JobPrefab, int>)obj).Second;
                            btn.Parent.UserData = obj;
                            for (int j = 0; j < images.Length; j++)