Ignore NREs from FlightGlobals.ActiveVessel (fixes #33)

Happens during compilation of internal spaces according to @JonnyOThan
HebaruSan · Jun 24, 2024 · 5002506 · 5002506 · JonnyOThan · Jun 24, 2024
1 parent 158f55d
commit 5002506
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/GameData/Astrogator/Astrogator-Changelog.cfg b/GameData/Astrogator/Astrogator-Changelog.cfg
@@ -10,6 +10,11 @@ KERBALCHANGELOG
 		version = 1.0.1
 		versionName = Vanish in black smoke
 		versionKSP = 1.12
+		CHANGE
+		{
+			change = Ignore NREs from FlightGlobals.ActiveVessel
+			type = Fix
+		}
 	}
 	VERSION
 	{

diff --git a/Source/AstrogatorMenu.cs b/Source/AstrogatorMenu.cs
@@ -20,8 +20,8 @@ public class AstrogatorMenu : InternalModule {
 			: base()
 		{
 			model = new AstrogationModel(
-				   (ITargetable)FlightGlobals.ActiveVessel
-				?? (ITargetable)FlightGlobals.getMainBody());
+				DefaultIfThrows<ITargetable>(() => FlightGlobals.ActiveVessel)
+				?? FlightGlobals.getMainBody());
 			loader = new AstrogationLoadBehaviorette(model, null);
 			timeToWait = new List<DateTimeParts>();
 			cursorTransfer = 0;

diff --git a/Source/KerbalTools.cs b/Source/KerbalTools.cs
@@ -316,5 +316,24 @@ public static string FilePath(string filename, bool GameDataRelative = true)
 			}
 		}
 
+		/// <summary>Discard annoying exceptions</summary>
+		/// <param name="func">The function to evaluate</param>
+		/// <returns>
+		///   The return value of func
+		///   or the default of its return type (typically null)
+		///   if it throws an exception
+		/// </returns>
+		public static T DefaultIfThrows<T>(Func<T> func)
+		{
+			try
+			{
+				return func();
+			}
+			catch
+			{
+				return default;
+			}
+		}
+
 	}
 }