Merge branch 'release/v2.1'

Author: pre-martin

StreamDeckSimHub.Installer/Actions/StartStreamDeckSoftware.cs

@@ -50,7 +50,9 @@ protected override Task<ActionResult> ExecuteInternal()
 
         private string GetStreamDeckInstallFolder()
         {
-            var installPath = (string)Registry.GetValue(Configuration.StreamDeckRegistryFolder, Configuration.StreamDeckRegistryInstallFolder, null);
+            // Try the new registry location first, then the old one.
+            var installPath = (string)Registry.GetValue(Configuration.StreamDeckSetupRegistryFolder, Configuration.StreamDeckRegistryInstallFolder, null) ??
+                              (string)Registry.GetValue(Configuration.StreamDeckRegistryFolder, Configuration.StreamDeckRegistryInstallFolder, null);
             return installPath;
         }
     }

StreamDeckSimHub.Installer/Tools/Configuration.cs

@@ -12,8 +12,9 @@ public static class Configuration
         public const string PluginProcessName = "StreamDeckSimHub";
 
         public const string StreamDeckRegistryFolder = @"HKEY_CURRENT_USER\SOFTWARE\Elgato Systems GmbH\StreamDeck";
+        public const string StreamDeckSetupRegistryFolder = @"HKEY_CURRENT_USER\SOFTWARE\Elgato Systems GmbH\StreamDeck (Setup)";
         public const string StreamDeckRegistryInstallFolder = "InstallDir";
-        public static readonly string StreamDeckDefaultInstallFolder = Path.Combine("C:", "Program Files", "Elgato", "StreamDeck");
+        public static readonly string StreamDeckDefaultInstallFolder = Path.Combine(@"C:\", "Program Files", "Elgato", "StreamDeck");
 
         public static readonly string AppDataRoaming = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
         public static readonly string StreamDeckPluginDir = Path.Combine(AppDataRoaming, "Elgato", "StreamDeck", "Plugins");