Fix assembly name for AGX, don't do version check for AGX as assembly…

… version is not set
krpc · Dec 16, 2016 · f74d3dc · f74d3dc
1 parent 9c98f17
commit f74d3dc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/server/src/Utils/APILoader.cs b/server/src/Utils/APILoader.cs
@@ -19,7 +19,7 @@ public static class APILoader
         /// <param name="apiName">Name of the API to load.</param>
         /// <param name="requiredVersion">Required API version.</param>
         [SuppressMessage ("Gendarme.Rules.Smells", "AvoidLongMethodsRule")]
-        public static bool Load (Type api, string assemblyName, string apiName, Version requiredVersion)
+        public static bool Load (Type api, string assemblyName, string apiName, Version requiredVersion = null)
         {
             if (api == null)
                 throw new ArgumentNullException ("api");
@@ -33,9 +33,11 @@ public static bool Load (Type api, string assemblyName, string apiName, Version
 
             // Version check
             var version = new Version (assembly.versionMajor, assembly.versionMinor);
-            if (version.CompareTo (requiredVersion) < 0) {
-                Error ("Failed to load " + assemblyName + "; found version " + version + " but version >= " + requiredVersion + " is required");
-                return false;
+            if (requiredVersion != null) {
+                if (version.CompareTo (requiredVersion) < 0) {
+                    Error ("Failed to load " + assemblyName + "; found version " + version + " but version >= " + requiredVersion + " is required");
+                    return false;
+                }
             }
 
             // Get type of APIs static class

diff --git a/service/SpaceCenter/src/ExternalAPI/AGX.cs b/service/SpaceCenter/src/ExternalAPI/AGX.cs
@@ -7,7 +7,7 @@ static class AGX
     {
         public static void Load ()
         {
-            IsAvailable = APILoader.Load (typeof(AGX), "ActionGroupsExtended", "ActionGroupsExtended.AGExtExternal, AGExt", new Version (2, 2));
+            IsAvailable = APILoader.Load (typeof(AGX), "AGExt", "ActionGroupsExtended.AGExtExternal");
         }
 
         public static bool IsAvailable { get; private set; }