Attempt to fix crash on startup that sometimes happens on some systems

astenlund · Oct 20, 2020 · c64b2c5 · c64b2c5
1 parent f1ba693
commit c64b2c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/MainWindow.xaml b/MainWindow.xaml
@@ -14,6 +14,7 @@
         Width="555" Height="370"
         MinWidth="555" MinHeight="370"
         Closing="Window_Closing"
+        Loaded="MainWindow_Loaded"
         DataContext="{Binding Main, Source={StaticResource Locator}}">
     <Window.Resources>
         <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -17,10 +17,13 @@ public MainWindow()
             InitializeComponent();
         }
 
-        protected override void OnSourceInitialized(EventArgs e)
+        private void Window_Closing(object sender, CancelEventArgs e)
         {
-            base.OnSourceInitialized(e);
+            ((ISimConnectMessageHandler) DataContext).Dispose();
+        }
 
+        private void MainWindow_Loaded(object sender, RoutedEventArgs e)
+        {
             HwndSource hwndSource = (HwndSource) PresentationSource.FromVisual(this)!;
             hwndSource.AddHook(WndProc);
             ((ISimConnectMessageHandler) DataContext).WindowHandle = hwndSource.Handle;
@@ -35,10 +38,5 @@ private IntPtr WndProc(IntPtr hWnd, int iMsg, IntPtr hWParam, IntPtr hLParam, re
 
             return IntPtr.Zero;
         }
-
-        private void Window_Closing(object sender, CancelEventArgs e)
-        {
-            ((ISimConnectMessageHandler) DataContext).Dispose();
-        }
     }
 }