DiscordBot/Entry.cs

@@ -11,7 +11,6 @@ namespace DiscordBot
     public class Entry
     {
         internal static StartupArguments startupArguments;
-        [STAThread]
         public static void Main(string[] args)
         {
             AppDomain currentDomain = AppDomain.CurrentDomain;
@@ -26,16 +25,7 @@ namespace DiscordBot
                 return assembly;
             }
 
-            Task.Run(async () => {
-                if (!File.Exists(Functions.dataFolder + "loader.json"))
-                {
-                    startupArguments = new StartupArguments();
-                    await Functions.SaveToJsonFile(Functions.dataFolder + "loader.json", startupArguments);
-                }
-                else
-                    startupArguments = await Functions.ConvertFromJson<StartupArguments>(Functions.dataFolder + "loader.json");
-                }).Wait();
-            Program.Startup(args.Concat(startupArguments.runArgs.Split(' ')).ToArray());
+            Program.Startup(args);
 
         }
     }

DiscordBot/Program.cs

@@ -178,6 +178,15 @@ public class Program
         Directory.CreateDirectory("./Data/Plugins");
         Directory.CreateDirectory("./Data/PAKS");
 
+        if (!File.Exists(Functions.dataFolder + "loader.json"))
+        {
+            Entry.startupArguments = new StartupArguments();
+            await Functions.SaveToJsonFile(Functions.dataFolder + "loader.json", Entry.startupArguments);
+        }
+        else
+            Entry.startupArguments = await Functions.ConvertFromJson<StartupArguments>(Functions.dataFolder + "loader.json");
+        
+
         Settings.sqlDatabase = new SqlDatabase("SetDB.dat");
 
         await Settings.sqlDatabase.Open();