Merge pull request #198 from pre-martin/fix/improved-streamdeck-folder-detection

Installer: Improved detection of Stream Deck installation folder.

Author: pre-martin

StreamDeckSimHub.Installer/Actions/StartStreamDeckSoftware.cs

@@ -18,6 +18,24 @@ public class StartStreamDeckSoftware : AbstractInstallerAction
         protected override Task<ActionResult> ExecuteInternal()
         {
             var installFolder = GetStreamDeckInstallFolder();
+            if (!string.IsNullOrEmpty(installFolder))
+            {
+                if (File.Exists(Path.Combine(installFolder, "StreamDeck.exe")))
+                {
+                    SetAndLogInfo($"Found Stream Deck directory in registry and verified executable: \"{installFolder}\"");
+                }
+                else
+                {
+                    SetAndLogInfo($"Found Stream Deck directory in registry \"{installFolder}\", but executable not found. Using default: {Configuration.StreamDeckDefaultInstallFolder}");
+                    installFolder = Configuration.StreamDeckDefaultInstallFolder;
+                }
+            }
+            else
+            {
+                SetAndLogInfo($"Could not find Stream Deck directory in registry. Using default: {Configuration.SimHubDefaultInstallFolder}");
+                installFolder = Configuration.StreamDeckDefaultInstallFolder;
+            }
+
             var streamDeckExePath = Path.Combine(installFolder, "StreamDeck.exe");
             if (!File.Exists(streamDeckExePath))
             {
@@ -33,14 +51,7 @@ protected override Task<ActionResult> ExecuteInternal()
         private string GetStreamDeckInstallFolder()
         {
             var installPath = (string)Registry.GetValue(Configuration.StreamDeckRegistryFolder, Configuration.StreamDeckRegistryInstallFolder, null);
-            if (!string.IsNullOrEmpty(installPath))
-            {
-                SetAndLogInfo($"Found Stream Deck directory in registry: {installPath}");
-                return installPath;
-            }
-
-            SetAndLogInfo($"Could not find Stream Deck directory in registry. Using default: {Configuration.SimHubDefaultInstallFolder}");
-            return Configuration.StreamDeckDefaultInstallFolder;
+            return installPath;
         }
     }
 }

StreamDeckSimHub.Installer/Actions/StopStreamDeckSoftware.cs

@@ -46,7 +46,7 @@ protected override async Task<ActionResult> ExecuteInternal()
             }
             else
             {
-                SetAndLogInfo("Plugin is not running.");
+                SetAndLogInfo("Plugin is not running, stopping not required.");
             }
 
             SetAndLogInfo("The Stream Deck software stopped.");