Merge pull request #672 from MOARdV/master

v0.30.5
Mihara · Jun 11, 2018 · 5a3f99d · 5a3f99d
2 parents a56ed1a + c29732e
commit 5a3f99d
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 20 deletions.
diff --git a/GameData/JSI/RasterPropMonitor/RasterPropMonitor.version b/GameData/JSI/RasterPropMonitor/RasterPropMonitor.version
@@ -5,7 +5,7 @@
   "VERSION": {
     "MAJOR": 0,
     "MINOR": 30,
-    "PATCH": 4
+    "PATCH": 5
   },
   "KSP_VERSION": {
     "MAJOR": 1,

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.30.4
+		version = 0.30.5
 	EndGlobalSection
 EndGlobal
diff --git a/RasterPropMonitor/Auxiliary modules/JSIFlashModule.cs b/RasterPropMonitor/Auxiliary modules/JSIFlashModule.cs
@@ -77,27 +77,34 @@ public void OnDestroy()
         /// <returns></returns>
         private IEnumerator FlashCoroutine()
         {
-            try
+            while (flashRate > 0.0f)
             {
-                while (flashRate > 0.0f)
+                float delay = 0.0f;
+                try
                 {
                     flashToggle = !flashToggle;
 
                     flashSubscribers(flashToggle);
 
-                    float delay = flashRate / TimeWarp.CurrentRate;
-
-                    if (delay < TimeWarp.fixedDeltaTime)
-                    {
-                        yield return new WaitForFixedUpdate();
-                    }
-                    else
-                    {
-                        yield return new WaitForSeconds(delay);
-                    }
+                    delay = flashRate / TimeWarp.CurrentRate;
+                }
+                catch
+                {
+                }
+                if (delay == 0.0f)
+                {
+                    yield return null;
                 }
+                else if (delay < TimeWarp.fixedDeltaTime)
+                {
+                    yield return new WaitForFixedUpdate();
+                }
+                else
+                {
+                    yield return new WaitForSeconds(delay);
+                }
+
             }
-            finally { }
 
             yield return null;
 

diff --git a/RasterPropMonitor/Core/RPMVesselComputer.cs b/RasterPropMonitor/Core/RPMVesselComputer.cs
@@ -634,7 +634,7 @@ protected override void OnAwake()
                 else
                 {
                     instances.Add(vessel.id, this);
-                    JUtil.LogMessage(this, "Awake for vessel {0} ({1}).", (string.IsNullOrEmpty(vessel.vesselName)) ? "(no name)" : vessel.vesselName, vessel.id);
+                    //JUtil.LogMessage(this, "Awake for vessel {0} ({1}).", (string.IsNullOrEmpty(vessel.vesselName)) ? "(no name)" : vessel.vesselName, vessel.id);
                 }
                 //vid = vessel.id;
             }
@@ -660,15 +660,15 @@ protected override void OnStart()
                 return;
             }
 
-            JUtil.LogMessage(this, "OnStart for vessel {0} ({1})", (string.IsNullOrEmpty(vessel.vesselName)) ? "(no name)" : vessel.vesselName, vessel.id);
+            //JUtil.LogMessage(this, "OnStart for vessel {0} ({1})", (string.IsNullOrEmpty(vessel.vesselName)) ? "(no name)" : vessel.vesselName, vessel.id);
             if (instances.ContainsKey(vessel.id))
             {
-                JUtil.LogErrorMessage(this, "Awake for vessel {0} ({1}), but it's already in the dictionary.", (string.IsNullOrEmpty(vessel.vesselName)) ? "(no name)" : vessel.vesselName, vessel.id);
+                //JUtil.LogErrorMessage(this, "Awake for vessel {0} ({1}), but it's already in the dictionary.", (string.IsNullOrEmpty(vessel.vesselName)) ? "(no name)" : vessel.vesselName, vessel.id);
             }
             else
             {
                 instances.Add(vessel.id, this);
-                JUtil.LogMessage(this, "Awake for vessel {0} ({1}).", (string.IsNullOrEmpty(vessel.vesselName)) ? "(no name)" : vessel.vesselName, vessel.id);
+                //JUtil.LogMessage(this, "Awake for vessel {0} ({1}).", (string.IsNullOrEmpty(vessel.vesselName)) ? "(no name)" : vessel.vesselName, vessel.id);
             }
             try
             {

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.30.4.*")]
+[assembly: AssemblyVersion("0.30.5.*")]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.