Merge branch 'dev' - fix for bug #46

mwerle · Jul 31, 2019 · ffcd472 · ffcd472
2 parents f121a9a + 202aaf6
commit ffcd472
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11 deletions.
diff --git a/GameData/NehemiahInc/NE-KEES.version b/GameData/NehemiahInc/NE-KEES.version
@@ -11,8 +11,8 @@
     {
         "MAJOR":0,
         "MINOR":8,
-        "PATCH":1,
-        "BUILD":28
+        "PATCH":2,
+        "BUILD":29
     },
     "KSP_VERSION":
     {

diff --git a/GameData/NehemiahInc/NEOS.version b/GameData/NehemiahInc/NEOS.version
@@ -12,8 +12,8 @@
     {
         "MAJOR":0,
         "MINOR":8,
-        "PATCH":1,
-        "BUILD":29
+        "PATCH":2,
+        "BUILD":30
     },
     "KSP_VERSION":
     {

diff --git a/GameData/NehemiahInc/NE_Science_Common/Plugins/NE_Science.dll b/GameData/NehemiahInc/NE_Science_Common/Plugins/NE_Science.dll
diff --git a/GameData/NehemiahInc/NE_Science_Common/Plugins/NE_Science.dll.mdb b/GameData/NehemiahInc/NE_Science_Common/Plugins/NE_Science.dll.mdb
diff --git a/OrbitalScience.build b/OrbitalScience.build
@@ -21,10 +21,10 @@
 	 - KEES - Kerbal Environmental Effects Study
 	 - NEOS - Nehemiah Enginneering Orbital Science (Was: All-in-One)
 	-->
-	<property name="NEOS.Version" value="0.8.1" />
+	<property name="NEOS.Version" value="0.8.2" />
 	<property name="OSS.Version" value="0.8.1" />
 	<property name="KRP.Version" value="0.8.1" />
-	<property name="KEES.Version" value="0.8.1" />
+	<property name="KEES.Version" value="0.8.2" />
 
 	<property name="CurrMod.dir" value="${build.dir}" />
 

diff --git a/Plugin/NE_Science/NE_Helper.cs b/Plugin/NE_Science/NE_Helper.cs
@@ -473,17 +473,22 @@ public static string AddExperimentAlarm(
         /** Deletes a KAC alarm by ID*/
         public static bool DeleteAlarm(string alarmId)
         {
+            if( !isKacEnabled() || string.IsNullOrEmpty(alarmId) )
+            {
+                return false;
+            }
             return KACAPI.DeleteAlarm(alarmId);
         }
 
         /** Deletes a KAC alarm */
         public static bool DeleteAlarm(KACWrapper.KACAPI.KACAlarm alarm)
         {
-            if (alarm != null)
+            if (!isKacEnabled() || alarm == null)
             {
-                return KACAPI.DeleteAlarm(alarm.ID);
+                return false;
+
             }
-            return false;
+            return KACAPI.DeleteAlarm(alarm.ID);
         }
     }
 

diff --git a/Plugin/NE_Science/NE_Science.csproj b/Plugin/NE_Science/NE_Science.csproj
@@ -129,6 +129,7 @@
     <None Include="../../GameData/**/*.*">
       <Link>%(RecursiveDir)%(FileName)</Link>
     </None>
+    <None Include=".editorconfig" />
     <None Include="NE_Science.cd" />
   </ItemGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/Plugin/NE_Science/Properties/AssemblyInfo.cs b/Plugin/NE_Science/Properties/AssemblyInfo.cs
@@ -29,11 +29,11 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.3.38")]
+[assembly: AssemblyVersion("0.8.3.39")]
 #if DEBUG
 [assembly: AssemblyInformationalVersion("0.8.3 Debug for KSP 1.7+")]
 #else
 [assembly: AssemblyInformationalVersion("0.8.3 for KSP 1.7+")]
 #endif
-[assembly: AssemblyFileVersion("0.8.3.38")]
+[assembly: AssemblyFileVersion("0.8.3.39")]
 [assembly: KSPAssembly("NE_Science", 0, 83)]