From aa784c121ba15e0b75939d00367e121b47486cf2 Mon Sep 17 00:00:00 2001
From: Westin Miller <equinoxscripts@gmail.com>
Date: Sun, 10 Sep 2017 15:17:50 -0700
Subject: [PATCH] Null protection in multiplayer manager detach

---
 Torch/Managers/MultiplayerManagerBase.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Torch/Managers/MultiplayerManagerBase.cs b/Torch/Managers/MultiplayerManagerBase.cs
index d6fcd8a..4825ac2 100644
--- a/Torch/Managers/MultiplayerManagerBase.cs
+++ b/Torch/Managers/MultiplayerManagerBase.cs
@@ -47,7 +47,7 @@ namespace Torch.Managers
         public event Action<IPlayer> PlayerJoined;
         /// <inheritdoc />
         public event Action<IPlayer> PlayerLeft;
-        
+
         public ObservableDictionary<ulong, PlayerViewModel> Players { get; } = new ObservableDictionary<ulong, PlayerViewModel>();
 
 #pragma warning disable 649
@@ -69,7 +69,8 @@ namespace Torch.Managers
         /// <inheritdoc />
         public override void Detach()
         {
-            MyMultiplayer.Static.ClientLeft -= OnClientLeft;
+            if (MyMultiplayer.Static != null)
+                MyMultiplayer.Static.ClientLeft -= OnClientLeft;
         }
 
         /// <inheritdoc />
@@ -114,7 +115,7 @@ namespace Torch.Managers
 
         protected void RaiseClientJoined(ulong steamId)
         {
-            var vm = new PlayerViewModel(steamId){State=ConnectionState.Connected};
+            var vm = new PlayerViewModel(steamId) { State = ConnectionState.Connected };
             _log.Info($"Player {vm.Name} joined ({vm.SteamId}");
             Players.Add(steamId, vm);
             PlayerJoined?.Invoke(vm);