Merge pull request #24 from hass-agent/development

Release: 2.0.0 migration null reference fix
hass-agent · Dec 23, 2023 · 5a85743 · 5a85743
2 parents fb51302 + 87f4d56
commit 5a85743
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/HASS.Agent.Installer/InstallerScript.iss b/src/HASS.Agent.Installer/InstallerScript.iss
@@ -69,7 +69,7 @@ Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
 Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 
 [Run]
-Filename: "{app}\{#MyAppExeName}"; Parameters: "compat_migrate"; Description: "Try to migrate configuration"; Flags: postinstall skipifsilent runascurrentuser
+Filename: "{app}\{#MyAppExeName}"; Parameters: "compat_migrate"; Description: "Try to migrate configuration"; Flags: postinstall skipifsilent runascurrentuser unchecked
 Filename: "{sys}\sc.exe"; Parameters: "start {#ServiceName}"; Description: "Start Satellite Service"; Flags: postinstall runhidden runascurrentuser 
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: postinstall skipifsilent nowait
 

diff --git a/src/HASS.Agent/HASS.Agent/Compatibility/MigrateCompatibilityTask.cs b/src/HASS.Agent/HASS.Agent/Compatibility/MigrateCompatibilityTask.cs
@@ -106,11 +106,14 @@ private void MigrateRegistryConfig()
             //from HKEY_CURRENT_USER\SOFTWARE\LAB02Research\HASSAgent
             //to   HKEY_CURRENT_USER\SOFTWARE\HASSAgent\Client"
 
-            //from HKEY_LOCAL_MACHINE\SOFTWARE\LAB02Research\HASSAgent\SatelliteService"
-            //to   HKEY_LOCAL_MACHINE\SOFTWARE\HASSAgent\SatelliteService
-
             var source = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\LAB02Research\HASSAgent");
             var destination = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\HASSAgent\Client", true);
+            if(source == null)
+            {
+                Log.Information("[COMPATTASK] No source registry keys found");
+                return;
+            }
+
             CopyRegistryKey(source, destination);
         }