Merge pull request #3597 from Alexees/mrtk_checkOrderChange

Change order of checks

Author: Railboy

Assets/MixedRealityToolkit/Services/MixedRealityToolkit.cs

@@ -618,24 +618,24 @@ public bool RegisterService<T>(Type interfaceType, SupportedPlatforms supportedP
                 return false;
             }
 
-            if (interfaceType == null)
+#if !UNITY_EDITOR
+            if (!Application.platform.IsPlatformSupported(supportedPlatforms))
+#else
+            if (!UnityEditor.EditorUserBuildSettings.activeBuildTarget.IsPlatformSupported(supportedPlatforms))
+#endif
             {
-                Debug.LogError("Unable to register a service with a null concrete type.");
                 return false;
             }
 
-            if (!typeof(IMixedRealityService).IsAssignableFrom(interfaceType))
+            if (interfaceType == null)
             {
-                Debug.LogError($"Unable to register the {interfaceType.Name} service. It does not implement {typeof(IMixedRealityService)}.");
+                Debug.LogError("Unable to register a service with a null concrete type.");
                 return false;
             }
 
-#if !UNITY_EDITOR
-            if (!Application.platform.IsPlatformSupported(supportedPlatforms))
-#else
-            if (!UnityEditor.EditorUserBuildSettings.activeBuildTarget.IsPlatformSupported(supportedPlatforms))
-#endif
+            if (!typeof(IMixedRealityService).IsAssignableFrom(interfaceType))
             {
+                Debug.LogError($"Unable to register the {interfaceType.Name} service. It does not implement {typeof(IMixedRealityService)}.");
                 return false;
             }