Merge pull request #289 from chroma-sdk/hotfix/registry-fix

Author: Sharparam

Colore.sln.DotSettings

@@ -280,6 +280,10 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/Filtering/ExcludeCoverageFilters/=Colore_002ETests_003B_002A_003B_002A_003B_002A/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/Filtering/ExcludeCoverageFilters/=Colore_003B_002A_003BColore_002ELogging_002E_002A_003B_002A/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/Filtering/ExcludeCoverageFilters/=Colore_003B_002A_003BColore_002ELogging_002ELogProviders_002E_002A_003B_002A/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EdotCover_002EIde_002ECore_002EFilterManagement_002EModel_002ESolutionFilterSettingsManagerMigrateSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>

src/Colore/Helpers/RegistryHelper.cs

@@ -39,6 +39,15 @@ namespace Colore.Helpers
     /// </summary>
     internal static class RegistryHelper
     {
+        /// <summary>
+        /// Path to a SubKey under "Razer Chroma SDK" in the registry containing information about the SDK.
+        /// </summary>
+        /// <remarks>
+        /// In some version of the SDK, the location of the "Enabled" key changed to be in this SubKey
+        /// under the main key in the registry for the Chroma SDK.
+        /// </remarks>
+        private const string AppsSubKeyPath = "Apps";
+
         /// <summary>
         /// Logger instance for this class.
         /// </summary>
@@ -103,9 +112,9 @@ internal static bool TryGetSdkVersion(out SdkVersion ver)
 
                     Log.WarnFormat(
                         "Unknown version component types, please tell a developer: Ma is {0}, Mi is {1}, R is {2}.",
-                        major.GetType(),
-                        minor.GetType(),
-                        revision.GetType());
+                        major?.GetType().ToString() ?? "<NULL>",
+                        minor?.GetType().ToString() ?? "<NULL>",
+                        revision?.GetType().ToString() ?? "<NULL>");
 
                     ver = new SdkVersion(0, 0, 0);
                     return false;
@@ -188,6 +197,19 @@ private static bool IsSdkEnabledInRegistry()
 
                         var value = key.GetValue("Enable");
 
+                        if (value is null)
+                        {
+                            Log.Debug("'Enable' under main registry subkey was NULL, trying 'Apps' subkey");
+
+                            using (var appsSubKey = key.OpenSubKey(AppsSubKeyPath))
+                            {
+                                if (appsSubKey != null)
+                                {
+                                    value = appsSubKey.GetValue("Enable");
+                                }
+                            }
+                        }
+
                         if (value is int i)
                         {
                             return i == 1;
@@ -196,7 +218,7 @@ private static bool IsSdkEnabledInRegistry()
                         Log.Warn(
                             "Chroma SDK has changed registry setting format. Please update Colore to latest version.");
 
-                        Log.DebugFormat("New Enabled type: {0}", value.GetType());
+                        Log.DebugFormat("New Enabled type: {0}", value?.GetType().ToString() ?? "<NULL>");
 
                         return true;
                     }