Unsubscribe from onVesselStandardModification on destruction as `On…

…UnloadVessel` may not be called
dkavolis · Aug 30, 2022 · efec236 · efec236
1 parent cc85b26
commit efec236
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/FerramAerospaceResearch/FARAeroComponents/FARVesselAero.cs b/FerramAerospaceResearch/FARAeroComponents/FARVesselAero.cs
@@ -295,7 +295,7 @@ private void CalculateAndApplyVesselAeroProperties()
 
             if (velocityWorldVector.NearlyEqual(lastSimResults.VelocityVector) &&
                 (FARAtmosphere.IsCustom
-                 // Custom atmospheres are not guaranteed to be independent of latitude and longitude
+                     // Custom atmospheres are not guaranteed to be independent of latitude and longitude
                      ? position.NearlyEqual(lastSimResults.Position)
                      : altitude.NearlyEqual(lastSimResults.Position.z)))
             {
@@ -308,7 +308,8 @@ private void CalculateAndApplyVesselAeroProperties()
             var dummy = new FARCenterQuery();
 
             //Calculate main gas properties
-            GasProperties properties = FARAtmosphere.GetGasProperties(vessel.mainBody, position, Planetarium.GetUniversalTime());
+            GasProperties properties =
+                FARAtmosphere.GetGasProperties(vessel.mainBody, position, Planetarium.GetUniversalTime());
 
             if (properties.Pressure <= 0 || properties.Temperature <= 0)
             {
@@ -523,15 +524,21 @@ public override void OnLoadVessel()
             base.OnLoadVessel();
         }
 
-        public override void OnUnloadVessel()
+        private void Unsubscribe()
         {
             GameEvents.onVesselStandardModification.Remove(VesselUpdateEvent);
+        }
+
+        public override void OnUnloadVessel()
+        {
+            Unsubscribe();
 
             base.OnUnloadVessel();
         }
 
         private void OnDestroy()
         {
+            Unsubscribe();
             DisableModule();
         }