Merge pull request #642 from MOARdV/master

v0.29.1 release
Mihara · Oct 9, 2017 · 1bb75a0 · 1bb75a0
2 parents 819b0dc + 1917bbd
commit 1bb75a0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/GameData/JSI/RasterPropMonitor/RasterPropMonitor.version b/GameData/JSI/RasterPropMonitor/RasterPropMonitor.version
@@ -5,12 +5,12 @@
   "VERSION": {
     "MAJOR": 0,
     "MINOR": 29,
-    "PATCH": 0
+    "PATCH": 1
   },
   "KSP_VERSION": {
     "MAJOR": 1,
     "MINOR": 3,
-    "PATCH": 0
+    "PATCH": 1
   },
   "KSP_VERSION_MIN":
   {

diff --git a/RasterPropMonitor.sln b/RasterPropMonitor.sln
@@ -195,6 +195,6 @@ Global
 		$36.inheritsSet = Mono
 		$36.inheritsScope = text/plain
 		$36.scope = text/plain
-		version = 0.29.0
+		version = 0.29.1
 	EndGlobalSection
 EndGlobal
diff --git a/RasterPropMonitor/Core/RPMVesselComputer.cs b/RasterPropMonitor/Core/RPMVesselComputer.cs
@@ -1541,7 +1541,7 @@ private void onVesselChange(Vessel who)
         /// <param name="who"></param>
         private void onVesselWasModified(Vessel who)
         {
-            if (who.id == vessel.id)
+            if (who != null && who.id == vessel.id)
             {
                 JUtil.LogMessage(this, "onVesselWasModified(): for me {0}", who.id);
                 if (JUtil.IsActiveVessel(vessel))

diff --git a/RasterPropMonitor/Handlers/JSITargetMenu.cs b/RasterPropMonitor/Handlers/JSITargetMenu.cs
@@ -105,6 +105,7 @@ public class JSITargetMenu : InternalModule
             { VesselType.Base,false },
             { VesselType.Debris,false },
             { VesselType.Unknown,false },
+            { VesselType.Relay,false }
         };
 
         private enum MenuList
@@ -783,6 +784,8 @@ private static int VesselFilterToBitmask(Dictionary<VesselType, bool> filterList
                 mask |= 1 << 8;
             if (filterList[VesselType.Unknown])
                 mask |= 1 << 9;
+            if (filterList[VesselType.Relay])
+                mask |= 1 << 10;
             return mask;
         }
 
@@ -798,6 +801,7 @@ private void VesselFilterFromBitmask(int mask)
             vesselFilter[VesselType.Base] = (mask & (1 << 7)) > 0;
             vesselFilter[VesselType.Debris] = (mask & (1 << 8)) > 0;
             vesselFilter[VesselType.Unknown] = (mask & (1 << 9)) > 0;
+            vesselFilter[VesselType.Relay] = (mask & (1 << 10)) > 0;
         }
 
         // Returns true if the reference part is a claw and the part can be

diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
@@ -12,7 +12,7 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 // Revision number is altered automatically.
-[assembly: AssemblyVersion("0.29.0.*")]
+[assembly: AssemblyVersion("0.29.1.*")]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.