Minor cleanup

TurbulenceDev · Oct 12, 2023 · f7e1e73 · f7e1e73
1 parent c4a78ca
commit f7e1e73
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/Turbulence.Desktop/MainWindow.axaml.cs b/Turbulence.Desktop/MainWindow.axaml.cs
@@ -7,27 +7,22 @@ namespace Turbulence.Desktop;
 
 public partial class MainWindow : Window
 {
-    SettingsWindow? _settingsWindow;
+    private SettingsWindow? _settingsWindow;
     public MainWindow()
     {
         InitializeComponent();
     }
 
     public async void OnSettings(object? _1, RoutedEventArgs _2)
     {
-        //TODO: instead show as a independent window?
-        _settingsWindow = new();
+        // TODO: instead show as a independent window?
+        _settingsWindow = new SettingsWindow();
         await _settingsWindow.ShowDialog(this);
     }
 
     public void OnExit(object? _1, RoutedEventArgs _2)
     {
-        var current = Application.Current;
-        if (current == null)
-            return;
-
-        var lifetime = current.ApplicationLifetime;
-        if (lifetime is IClassicDesktopStyleApplicationLifetime desktop)
+        if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
             desktop.Shutdown();
     }
 }