server now closes properly on program exit

Author: maxijabase

UI/MainWindow/MainWindow.xaml.cs

@@ -173,7 +173,11 @@ private void DockingPaneGroup_ChildrenTreeChanged(object sender, ChildrenTreeCha
 
         private void MetroWindow_Closing(object sender, CancelEventArgs e)
         {
-            ServerCheckThread?.Abort(); //a join would not work, so we have to be..forcefully...
+            if (ServerIsRunning)
+            {
+                ServerCheckThread.Abort();
+                ServerProcess.Kill();
+            }
             var lastOpenFiles = new List<string>();
             var editors = GetAllEditorElements();
             bool? SaveUnsaved = null;
@@ -447,7 +451,7 @@ public void UpdateWindowTitle()
 
             if (ServerIsRunning)
             {
-                outString = $"{outString} | ({Program.Translations.GetLanguage("ServerRunning")})";
+                outString = $"{outString} | {Program.Translations.GetLanguage("ServerRunning")}";
             }
 
             Title = outString;

UI/MainWindow/MainWindowSPCompiler.cs

@@ -496,30 +496,29 @@ private void ProcessCheckWorker()
             try
             {
                 ServerProcess.Start();
+                ServerIsRunning = true;
+                Program.MainWindow.Dispatcher?.Invoke(() =>
+                {
+                    EnableServerAnim.Begin();
+                    UpdateWindowTitle();
+                });
+                ServerProcess.WaitForExit();
+                ServerProcess.Dispose();
+                ServerIsRunning = false;
+                Program.MainWindow.Dispatcher?.Invoke(() =>
+                {
+                    if (Program.MainWindow.IsLoaded)
+                    {
+                        DisableServerAnim.Begin();
+                        UpdateWindowTitle();
+                    }
+                    LoggingControl.LogAction("Server started.", 2);
+                });
             }
             catch (Exception)
             {
                 return;
             }
-
-            ServerIsRunning = true;
-            Program.MainWindow.Dispatcher?.Invoke(() =>
-            {
-                EnableServerAnim.Begin();
-                UpdateWindowTitle();
-            });
-            ServerProcess.WaitForExit();
-            ServerProcess.Dispose();
-            ServerIsRunning = false;
-            Program.MainWindow.Dispatcher?.Invoke(() =>
-            {
-                if (Program.MainWindow.IsLoaded)
-                {
-                    DisableServerAnim.Begin();
-                    UpdateWindowTitle();
-                }
-                LoggingControl.LogAction("Server started.", 2);
-            });
         }
 
         private string ShortenScriptFileName(string fileName)