archive
/
MaiTouchSensorEmulator
mirror of https://github.com/Leapward-Koex/MaiTouchSensorEmulator
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Better handling of errors when app is unable to access sinmai process for exiting

pull/7/head 1.0.3
LeapwardKoex 2024-02-14 20:42:05 +13:00
parent db5e3c5903
commit ed95e6eb35
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
MainWindow.xaml.cs
View File

@ -76,12 +76,16 @@ public partial class MainWindow : Window
}; };
} }
private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e) private async void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{ {
e.Cancel = true;
await connector.Disconnect();
foreach (Window childWindow in OwnedWindows) foreach (Window childWindow in OwnedWindows)
{ {
childWindow.Close(); childWindow.Close();
} }
Closing -= MainWindow_Closing;
Close();
} }
private async void ExitWithSinmaiLoop() private async void ExitWithSinmaiLoop()
@ -100,15 +104,30 @@ public partial class MainWindow : Window
await Task.Delay(1000); await Task.Delay(1000);
} }
} }
await sinamiProcess.WaitForExitAsync();
Logger.Info("Sinmai exited");
var dataContext = (MainWindowViewModel)DataContext; var dataContext = (MainWindowViewModel)DataContext;
if (dataContext.IsExitWithSinmaiEnabled) if (dataContext.IsExitWithSinmaiEnabled)
{ {
Logger.Info("Disconnecting from COM port before shutting down"); try
await connector.Disconnect(); {
Logger.Info("Shutting down..."); await sinamiProcess.WaitForExitAsync();
Application.Current.Shutdown(); Logger.Info("Sinmai exited");
if (dataContext.IsExitWithSinmaiEnabled)
{
Logger.Info("Disconnecting from COM port before shutting down");
await connector.Disconnect();
Logger.Info("Shutting down...");
Application.Current.Shutdown();
}
}
catch (Exception ex)
{
Logger.Error("Failed to wait for sinmai to exit", ex);
dataContext.IsExitWithSinmaiEnabled = false;
Properties.Settings.Default.IsExitWithSinmaiEnabled = dataContext.IsExitWithSinmaiEnabled;
Properties.Settings.Default.Save();
MessageBox.Show("Failed to listen for Sinmai exit signal, is it running as admin?\n\nAutomatic exiting disabled.", "Failed to listen for Sinmai exit", MessageBoxButton.OK, MessageBoxImage.Information);
}
} }
} }