Fix crash that could occasionally occur when exiting Flight Simulator

astenlund · Oct 7, 2020 · 63de517 · 63de517
1 parent 7034ce2
commit 63de517
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/FlightSim/FlightSimAdapter.cs b/FlightSim/FlightSimAdapter.cs
@@ -79,12 +79,12 @@ private void DisconnectInternal(bool failure)
         {
             UnsubscribeEvents();
 
-            _simConnect?.Dispose();
-            _simConnect = null;
-
             _attitudeTimer?.Dispose();
             _attitudeTimer = null;
 
+            _simConnect?.Dispose();
+            _simConnect = null;
+
             StateChanged?.Invoke(failure);
         }
 
@@ -126,12 +126,19 @@ private void RegisterTrafficStruct()
 
         private void RequestAttitudeData(object? _)
         {
-            _simConnect?.RequestDataOnSimObject(
-                REQUEST.Attitude, DEFINITION.Attitude,
-                SimConnect.SIMCONNECT_OBJECT_ID_USER,
-                SIMCONNECT_PERIOD.ONCE,
-                SIMCONNECT_DATA_REQUEST_FLAG.DEFAULT,
-                0, 0, 0);
+            try
+            {
+                _simConnect?.RequestDataOnSimObject(
+                    REQUEST.Attitude, DEFINITION.Attitude,
+                    SimConnect.SIMCONNECT_OBJECT_ID_USER,
+                    SIMCONNECT_PERIOD.ONCE,
+                    SIMCONNECT_DATA_REQUEST_FLAG.DEFAULT,
+                    0, 0, 0);
+            }
+            catch (COMException e)
+            {
+                Console.Error.WriteLine("Exception caught: " + e);
+            }
         }
 
         private void SimConnect_OnRecvEventObjectAddremove(SimConnect sender, SIMCONNECT_RECV_EVENT_OBJECT_ADDREMOVE data)