From f41047300fbbe3e89aa7e50a2c782c8295edf6bd Mon Sep 17 00:00:00 2001
From: Kenneth van Ewijk <kennyboy@live.nl>
Date: Tue, 20 Oct 2015 23:28:02 +0200
Subject: [PATCH] Correct loading on start. Bugfixes

---
 ErgometerDoctorApplication/MainClient.cs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/ErgometerDoctorApplication/MainClient.cs b/ErgometerDoctorApplication/MainClient.cs
index 67dde48..74c08e7 100644
--- a/ErgometerDoctorApplication/MainClient.cs
+++ b/ErgometerDoctorApplication/MainClient.cs
@@ -96,8 +96,12 @@ namespace ErgometerDoctorApplication
                 loggedin = true;
             }
 
-            //SendNetCommand(new NetCommand(NetCommand.RequestType.USERS, Session));
+            
             SendNetCommand(new NetCommand(NetCommand.RequestType.SESSIONDATA, Session));
+            Thread.Sleep(15);
+            SendNetCommand(new NetCommand(NetCommand.RequestType.USERS, Session));
+
+            Thread.Sleep(200);
 
             return true;
         }
@@ -105,7 +109,7 @@ namespace ErgometerDoctorApplication
         public static void Disconnect()
         {
 
-            if (Server.Connected)
+            if (Server != null && Server.Connected)
             {
                 NetHelper.SendNetCommand(Server, new NetCommand(NetCommand.CommandType.LOGOUT, Session));
                 loggedin = false;
@@ -127,7 +131,8 @@ namespace ErgometerDoctorApplication
                 }
             }
 
-            Server.Close();
+            if(Server != null)
+                Server.Close();
         }
 
         private static bool UsersBeingSent = false;
@@ -218,7 +223,10 @@ namespace ErgometerDoctorApplication
 
         public static void SendNetCommand(NetCommand command)
         {
-            NetHelper.SendNetCommand(Server, command);
+            if(! NetHelper.SendNetCommand(Server, command))
+            {
+                Disconnect();
+            }
         }
 
         private static bool IsSessionRunning(int session)