Recompile for KSP 1.4.0; Fixed NRE when importing custom waypoints.

Author: jrossignol

CHANGES.txt

@@ -1,3 +1,7 @@
+Waypoint Manager 2.7.1
+- Recompile for KSP 1.4.0
+- Fixed NRE when importing custom waypoints before stock waypoint manager is loaded (thanks linuxgurugamer).
+
 Waypoint Manager 2.7.0
 - Recompile for KSP 1.3.0.
 - Don't allow stock toolbar icon to be disabled if Blizzy's toolbar isn't installed.

GameData/WaypointManager/WaypointManager.dll

@@ -129,7 +129,7 @@ public static void Import()
             ConfigNode configNode = ConfigNode.Load(CustomWaypointsFileName);
             if (configNode == null)
             {
-                ScreenMessages.PostScreenMessage(string.Format("Couldn't load customer waypoint file {0}!", CustomWaypointsFileName),
+                ScreenMessages.PostScreenMessage(string.Format("Couldn't load custom waypoint file {0}!", CustomWaypointsFileName),
                     6.0f, ScreenMessageStyle.UPPER_CENTER);
                 return;
             }
@@ -145,15 +145,18 @@ public static void Import()
                 double longitude = double.Parse(child.GetValue("longitude"));
                 double altitude = double.Parse(child.GetValue("altitude"));
 
-                foreach (Waypoint wp in FinePrint.WaypointManager.Instance().Waypoints)
+                if (FinePrint.WaypointManager.Instance() != null)
                 {
-                    if (wp.celestialName == celestialName &&
-                        Math.Abs(wp.latitude - latitude) < 0.00001 &&
-                        Math.Abs(wp.longitude - longitude) < 0.00001 &&
-                        Math.Abs(wp.altitude - altitude) < 0.1)
+                    foreach (Waypoint wp in FinePrint.WaypointManager.Instance().Waypoints)
                     {
-                        isDuplicate = true;
-                        break;
+                        if (wp.celestialName == celestialName &&
+                            Math.Abs(wp.latitude - latitude) < 0.00001 &&
+                            Math.Abs(wp.longitude - longitude) < 0.00001 &&
+                            Math.Abs(wp.altitude - altitude) < 0.1)
+                        {
+                            isDuplicate = true;
+                            break;
+                        }
                     }
                 }
 

source/WaypointManager/CustomWaypoints.cs

@@ -33,6 +33,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0")]
-[assembly: AssemblyFileVersion("2.6.2")]
-[assembly: AssemblyInformationalVersion("2.6.2")]
+[assembly: AssemblyFileVersion("2.7.1")]
+[assembly: AssemblyInformationalVersion("2.7.1")]
 [assembly: KSPAssembly("WaypointManager", 1, 0)]