(913ed2ce9) Merge remote-tracking branch 'origin/dev' into enemy-ai

2019-03-26 14:07:11 +02:00
parent 14832e2040
commit 4b3e78b566
11 changed files with 167 additions and 45 deletions
@@ -457,11 +457,14 @@ namespace Barotrauma
                {
                    IgnoreLayoutGroups = true,
                    OnClicked = (GUIButton btn, object obj) => { StartRound?.Invoke(); return true; },
-                    Enabled = true,
-                    Visible = GameMain.Client == null ||
-                        GameMain.Client.HasPermission(Networking.ClientPermissions.ManageRound) ||
-                        GameMain.Client.HasPermission(Networking.ClientPermissions.ManageCampaign)
+                    Enabled = true
                };
+                if (GameMain.Client != null)
+                {
+                    startButton.Visible = !GameMain.Client.GameStarted &&
+                        (GameMain.Client.HasPermission(Networking.ClientPermissions.ManageRound) ||
+                        GameMain.Client.HasPermission(Networking.ClientPermissions.ManageCampaign));
+                }
            }

            OnLocationSelected?.Invoke(location, connection);