Hotfix for crash on Discord RPC off

- Fixed crash when Discord RPC is turned off.
TCNOco · May 26, 2022 · aed0d6d · aed0d6d
1 parent f754037
commit aed0d6d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/TcNo-Acc-Switcher-Globals/Globals.cs b/TcNo-Acc-Switcher-Globals/Globals.cs
@@ -27,7 +27,7 @@ public partial class Globals
 #pragma warning disable CA2211 // Non-constant fields should not be visible - This is necessary due to it being a launch parameter.
         public static bool VerboseMode;
 #pragma warning restore CA2211 // Non-constant fields should not be visible
-        public static readonly string Version = "2022-05-26_00";
+        public static readonly string Version = "2022-05-26_01";
 
         #region INITIALISATION
 

diff --git a/TcNo-Acc-Switcher-Server/Data/AppData.cs b/TcNo-Acc-Switcher-Server/Data/AppData.cs
@@ -73,7 +73,7 @@ public static void FirstLaunchCheck()
                 new Thread(AppStats.UploadStats).Start();
 
             // Discord integration
-            RefreshDiscordPresence();
+            RefreshDiscordPresenceAsync();
 
             // Unused. Idk if I will use these, but they are here just in-case.
             //DiscordClient.OnReady += (sender, e) => { Console.WriteLine("Received Ready from user {0}", e.User.Username); };
@@ -92,9 +92,13 @@ public static void RefreshDiscordPresence()
 
             if (!AppSettings.DiscordRpc)
             {
-                if (!DiscordClient.IsInitialized) return;
-                DiscordClient.Deinitialize();
-                DiscordClient = null;
+                if (DiscordClient != null)
+                {
+                    if (!DiscordClient.IsInitialized) return;
+                    DiscordClient.Deinitialize();
+                    DiscordClient = null;
+                }
+
                 return;
             }