Immediately hide launcher window when it is closing (SubnauticaNitrox#1354)

* Removed double import of MSTest.TestAdapter.targets in NitroxTest.csproj

* Cleaned up how launcher exists

Asked user if they are sure when embedded server is running.
Fixed double close calling due to close event from WPF.

* Immediately hide window when it is closing

Author: Measurity

NitroxLauncher/App.xaml.cs

@@ -39,19 +39,10 @@ protected override void OnStartup(StartupEventArgs e)
             base.OnStartup(e);
         }
 
-        protected override void OnExit(ExitEventArgs e)
-        {
-            MainWindow window = (MainWindow)Current.MainWindow;
-            window?.CloseInternalServerAndRemovePatchAsync();
-
-            base.OnExit(e);
-        }
-
         private void Application_DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
         {
-            // If something went wrong. Close the server
-            MainWindow window = (MainWindow)Current.MainWindow;
-            window?.CloseInternalServerAndRemovePatchAsync();
+            // If something went wrong. Close the server if embedded.
+            LauncherLogic.Instance.Dispose();
             Log.Error(e.Exception.GetBaseException().ToString()); // Gets the exception that was unhandled, not the "dispatched unhandled" exception.
             MessageBox.Show(GetExceptionError(e.Exception), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
         }

NitroxLauncher/LauncherLogic.cs

@@ -54,6 +54,12 @@ public LauncherLogic()
 
         public void Dispose()
         {
+            Application.Current.MainWindow?.Hide();
+            if (isEmbedded)
+            {
+                Instance.SendServerCommand("stop\n");
+            }
+            
             try
             {
                 nitroxEntryPatch.Remove();
@@ -68,13 +74,13 @@ public void Dispose()
             serverProcess = null; // Indicate the process is dead now.
         }
 
-        public async Task WriteToServerAsync(string inputText)
+        public void WriteToServer(string inputText)
         {
             if (ServerRunning)
             {
                 try
                 {
-                    await serverProcess.StandardInput.WriteLineAsync(inputText);
+                    serverProcess.StandardInput.WriteLine(inputText);
                 }
                 catch (Exception)
                 {
@@ -262,14 +268,14 @@ internal Process StartServer(bool standalone)
             return serverProcess;
         }
 
-        internal async Task SendServerCommandAsync(string inputText)
+        internal void SendServerCommand(string inputText)
         {
             if (!ServerRunning)
             {
                 return;
             }
 
-            await WriteToServerAsync(inputText);
+            WriteToServer(inputText);
         }
 
         private void OnEndServer()

NitroxLauncher/MainWindow.xaml.cs

@@ -98,38 +98,30 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
-        internal async Task CloseInternalServerAndRemovePatchAsync()
-        {
-            await LauncherLogic.Instance.SendServerCommandAsync("stop\n");
-            logic.Dispose();
-        }
-
         private bool CanClose()
         {
             if (logic.ServerRunning && isServerEmbedded)
             {
-                MessageBox.Show("The embedded server is still running.", "Close aborted", MessageBoxButton.OK, MessageBoxImage.Warning);
-                return false;
+                MessageBoxResult userAnswer = MessageBox.Show("The embedded server is still running. Click yes to close.", "Close aborted", MessageBoxButton.YesNo, MessageBoxImage.Warning);
+                return userAnswer == MessageBoxResult.Yes;
             }
 
             return true;
         }
 
-        private async void OnClosing(object sender, CancelEventArgs e)
+        private void OnClosing(object sender, CancelEventArgs e)
         {
             if (!CanClose())
             {
                 e.Cancel = true;
+                return;
             }
-            await CloseInternalServerAndRemovePatchAsync();
+            logic.Dispose();
         }
 
         private void Close_Click(object sender, RoutedEventArgs e)
         {
-            if (CanClose())
-            {
-                Close();
-            }
+            Close();
         }
 
         private void Minimze_Click(object sender, RoutedEventArgs e)

NitroxLauncher/Pages/ServerConsolePage.xaml.cs

@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
 using NitroxLauncher.Events;
@@ -98,9 +97,9 @@ private void ServerDataReceived(object sender, DataReceivedEventArgs e)
             ServerOutput += e.Data + Environment.NewLine;
         }
 
-        private async Task SendCommandInputToServerAsync()
+        private void SendCommandInputToServer()
         {
-            await LauncherLogic.Instance.SendServerCommandAsync(CommandInputText);
+            LauncherLogic.Instance.SendServerCommand(CommandInputText);
             ServerOutput += CommandInputText + Environment.NewLine;
 
             // Deduplication of command history
@@ -116,29 +115,29 @@ private void HideCommandHistory()
             CommandHistoryIndex = commandLinesHistory.Count;
         }
 
-        private async void CommandButton_OnClick(object sender, RoutedEventArgs e)
+        private void CommandButton_OnClick(object sender, RoutedEventArgs e)
         {
-            await SendCommandInputToServerAsync();
+            SendCommandInputToServer();
         }
 
-        private async void StopButton_Click(object sender, RoutedEventArgs e)
+        private void StopButton_Click(object sender, RoutedEventArgs e)
         {
             // Suggest referencing NitroxServer.ConsoleCommands.ExitCommand.name, but the class is internal
-            await LauncherLogic.Instance.SendServerCommandAsync("stop");
+            LauncherLogic.Instance.SendServerCommand("stop");
             ServerOutput += $"stop{Environment.NewLine}";
 
             commandLinesHistory.Add("stop");
             HideCommandHistory();
         }
 
-        private async void CommandLine_PreviewKeyDown(object sender, KeyEventArgs e)
+        private void CommandLine_PreviewKeyDown(object sender, KeyEventArgs e)
         {
             e.Handled = true;
 
             switch (e.Key)
             {
                 case Key.Enter:
-                    await SendCommandInputToServerAsync();
+                    SendCommandInputToServer();
                     break;
                 case Key.Escape:
                     HideCommandHistory();

NitroxTest/NitroxTest.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -145,5 +145,4 @@
     <Error Condition="!Exists('$(PkgMSTest_TestAdapter)\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '$(PkgMSTest_TestAdapter)\build\net45\MSTest.TestAdapter.props'))" />
     <Error Condition="!Exists('$(PkgMSTest_TestAdapter)\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PkgMSTest_TestAdapter)\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="$(PkgMSTest_TestAdapter)\build\net45\MSTest.TestAdapter.targets" Condition="Exists('$(PkgMSTest_TestAdapter)\build\net45\MSTest.TestAdapter.targets')" />
-</Project>
+</Project>