Stop an NRE when checking the registry for startup tasks.

Spec-ify · Dec 17, 2023 · f957e04 · f957e04
1 parent 4e2055c
commit f957e04
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/client/DebugLog.cs b/client/DebugLog.cs
@@ -81,10 +81,10 @@ public static void CheckOpenTasks()
             var section = OpenTasks[i];
             if(section.Count > 0)
             {
-                LogEvent($"{region} has outstanding tasks", region, EventType.ERROR);
+                LogEvent($"{region} has outstanding tasks:", region, EventType.ERROR);
                 foreach(var task in section)
                 {
-                    LogEvent(task.Key, region);
+                    LogEvent($"OUTSTANDING: {task.Key}", region);
                 }
             }
         }

diff --git a/client/data/Methods/System.cs b/client/data/Methods/System.cs
@@ -35,19 +35,19 @@ public static async Task MakeSystemData()
             Region region = Region.System;
             await StartRegion(region);
 
-            systemTaskList.Add(GetEnvironmentVariables());
-            systemTaskList.Add(GetSystemWMIInfo());
-            systemTaskList.Add(CheckCommercialOneDrive());
-            systemTaskList.Add(GetInstalledApps());
-            systemTaskList.Add(GetScheduledTasks());
+            systemTaskList.Add(GetEnvironmentVariables()); 
+            systemTaskList.Add(GetSystemWMIInfo()); 
+            systemTaskList.Add(CheckCommercialOneDrive()); 
+            systemTaskList.Add(GetInstalledApps()); 
+            systemTaskList.Add(GetScheduledTasks()); 
             systemTaskList.Add(GetStartupTasks());
-            systemTaskList.Add(RegistryCheck());
-            systemTaskList.Add(GetMicroCodes());
-            systemTaskList.Add(GetStaticCoreCount());
-            systemTaskList.Add(GetBrowserExtensions());
-            systemTaskList.Add(GetMiniDumps());
-            systemTaskList.Add(GetDefaultBrowser());
-            systemTaskList.Add(GetProcesses());
+            systemTaskList.Add(RegistryCheck()); 
+            systemTaskList.Add(GetMicroCodes()); 
+            systemTaskList.Add(GetStaticCoreCount()); 
+            systemTaskList.Add(GetBrowserExtensions()); 
+            systemTaskList.Add(GetMiniDumps()); 
+            systemTaskList.Add(GetDefaultBrowser()); 
+            systemTaskList.Add(GetProcesses()); 
 
             // Check if username contains non-alphanumeric characters
             UsernameSpecialCharacters = !Regex.IsMatch(Environment.UserName, @"^[a-zA-Z0-9]+$");
@@ -239,10 +239,13 @@ private static async Task<List<StartupTask>> GetStartupTasksAtKey(string keyLoca
     {
         List<StartupTask> startupTasks = new();
         var key = reg.OpenSubKey(keyLocation);
-        foreach (var appName in key.GetValueNames())
+        if (key != null)
         {
-            var startupTask = await CreateStartupTask(appName, (string)key.GetValue(appName));
-            startupTasks.Add(startupTask);
+            foreach (var appName in key.GetValueNames())
+            {
+                var startupTask = await CreateStartupTask(appName, (string)key.GetValue(appName));
+                startupTasks.Add(startupTask);
+            }
         }
         return startupTasks;
     }