From f3b70a8edb0a0749ebd1011f4297ec53c5f395fa Mon Sep 17 00:00:00 2001
From: Neil Dorin <ndorin@pepperdash.com>
Date: Thu, 12 Dec 2019 15:14:55 -0700
Subject: [PATCH] Adds better null check to WaitAndTryReconnect()

---
 .../Pepperdash Core/Comm/GenericTcpIpClient.cs         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs
index 53349df..c043da3 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
@@ -317,16 +317,16 @@ namespace PepperDash.Core
         /// </summary>
 		void WaitAndTryReconnect()
 		{
+            DisconnectClient();
+            
             if (Client != null)
             {
                 Debug.Console(1, "Attempting reconnect, status={0}", Client.ClientStatus);
+
+                if (!DisconnectCalledByUser)
+                    RetryTimer = new CTimer(o => { Client.ConnectToServerAsync(ConnectToServerCallback); }, AutoReconnectIntervalMs);
             }
 
-            DisconnectClient();
-
-            if (!DisconnectCalledByUser)
-                RetryTimer = new CTimer(o => { Client.ConnectToServerAsync(ConnectToServerCallback); }, AutoReconnectIntervalMs);
-
 		}
 
         /// <summary>