5.1, bugfixes

jrbudda · Jun 3, 2018 · c007db7 · c007db7
1 parent 65c7dbd
commit c007db7
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 15 deletions.
diff --git a/Assets/Plugins/KerbalEngineer.Unity.dll b/Assets/Plugins/KerbalEngineer.Unity.dll
diff --git a/Documents/CHANGES.txt b/Documents/CHANGES.txt
@@ -1,3 +1,7 @@
+1.1.5.1, 2018-6-2, KSP 1.4.3 #2152
+ - Fix Target Selector and post-burn-relative-inclicnation not updating if they were the only rendezvous readouts showing.
+ - Fix error in tracking station.
+
 1.1.5.0, 2018-6-1, KSP 1.4.3 #2152
  - You can now set custom colors for all readout values. These are stored in ReadoutsConfig.xml which you can delete if something goes horribly awry.
  - Added readouts: post-burn eccentricity, post-burn relative inclination, dynamic pressure.

diff --git a/KerbalEngineer/EngineerGlobals.cs b/KerbalEngineer/EngineerGlobals.cs
@@ -21,7 +21,7 @@ public static class EngineerGlobals
         /// <summary>
         /// Current version of the Kerbal Engineer assembly.
         /// </summary>
-        public const string ASSEMBLY_VERSION = "1.1.5.0";
+        public const string ASSEMBLY_VERSION = "1.1.5.1";
 
         private static string assemblyFile;
         private static string assemblyName;

diff --git a/KerbalEngineer/Flight/Readouts/Rendezvous/RendezvousProcessor.cs b/KerbalEngineer/Flight/Readouts/Rendezvous/RendezvousProcessor.cs
@@ -232,7 +232,11 @@ public void Update() {
 
             ITargetable target = null;
             global::Vessel vessel = null;
-
+            landedSamePlanet = false;
+            isLanded = false;
+            overrideANDN = false;
+            overrideANDNRev = false;
+
             if (HighLogic.LoadedSceneIsFlight) {
                 if (FlightGlobals.fetch == null ||
                     FlightGlobals.fetch.VesselTarget == null ||
@@ -400,7 +404,7 @@ public void Update() {
 
 
 
-                    if (FlightGlobals.ActiveVessel.patchedConicSolver == null ||
+                    if (FlightGlobals.ActiveVessel == null || FlightGlobals.ActiveVessel.patchedConicSolver == null ||
                         FlightGlobals.ActiveVessel.patchedConicSolver.maneuverNodes == null ||
                         FlightGlobals.ActiveVessel.patchedConicSolver.maneuverNodes.Count == 0) {
                     } else {

diff --git a/KerbalEngineer/Flight/Readouts/Rendezvous/TargetSelector.cs b/KerbalEngineer/Flight/Readouts/Rendezvous/TargetSelector.cs
@@ -264,18 +264,24 @@ private void DrawTarget(Unity.Flight.ISectionModule section) {
 
                 this.DrawLine("Selected Target", RendezvousProcessor.nameForTargetable(target), section.IsHud);
 
-                if (RendezvousProcessor.sourceDisplay != null) {
-                    if (RendezvousProcessor.landedSamePlanet || RendezvousProcessor.overrideANDN)
-                        this.DrawLine("Ref Orbit", "Landed on " + RendezvousProcessor.activeVessel.GetOrbit().referenceBody.GetName(), section.IsHud);
-                    else
-                        this.DrawLine("Ref Orbit", RendezvousProcessor.sourceDisplay, section.IsHud);
-                }
+                try {
+
+                    if (RendezvousProcessor.sourceDisplay != null) {
+                        if (RendezvousProcessor.landedSamePlanet || RendezvousProcessor.overrideANDN)
+                            this.DrawLine("Ref Orbit", "Landed on " + RendezvousProcessor.activeVessel.GetOrbit().referenceBody.GetName(), section.IsHud);
+                        else
+                            this.DrawLine("Ref Orbit", RendezvousProcessor.sourceDisplay, section.IsHud);
+                    }
+
+                    if (RendezvousProcessor.targetDisplay != null) {
+                        if (RendezvousProcessor.landedSamePlanet || RendezvousProcessor.overrideANDNRev)
+                            this.DrawLine("Target Orbit", "Landed on " + target.GetOrbit().referenceBody.GetName(), section.IsHud);
+                        else
+                            this.DrawLine("Target Orbit", RendezvousProcessor.targetDisplay, section.IsHud);
+                    }
 
-                if (RendezvousProcessor.targetDisplay != null) {
-                    if (RendezvousProcessor.landedSamePlanet || RendezvousProcessor.overrideANDNRev)
-                        this.DrawLine("Target Orbit", "Landed on " + target.GetOrbit().referenceBody.GetName(), section.IsHud);
-                    else
-                        this.DrawLine("Target Orbit", RendezvousProcessor.targetDisplay, section.IsHud);
+                } catch (System.Exception) {
+                    Debug.Log(" target " + target + " " + RendezvousProcessor.activeVessel + " " + target.GetOrbit() + " " + RendezvousProcessor.overrideANDN + " " + RendezvousProcessor.overrideANDNRev + " " + RendezvousProcessor.landedSamePlanet);
                 }
 
             }

diff --git a/Output/KerbalEngineer/KerbalEngineer.Unity.dll b/Output/KerbalEngineer/KerbalEngineer.Unity.dll
diff --git a/Output/KerbalEngineer/KerbalEngineer.dll b/Output/KerbalEngineer/KerbalEngineer.dll
diff --git a/Output/KerbalEngineer/KerbalEngineer.version b/Output/KerbalEngineer/KerbalEngineer.version
@@ -7,7 +7,7 @@
 		"MAJOR":1,
 		"MINOR":1,
 		"PATCH":5,
-		"BUILD":0
+		"BUILD":1
 	},
 	"KSP_VERSION":
 	{