Fix #1069

BartoszCichecki · Dec 9, 2023 · a2cd862 · a2cd862
1 parent 0634174
commit a2cd862
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/LenovoLegionToolkit.Lib/AutoListeners/GameAutoListener.cs b/LenovoLegionToolkit.Lib/AutoListeners/GameAutoListener.cs
@@ -223,7 +223,12 @@ private void Process_Exited(object? o, EventArgs args)
             if (Log.Instance.IsTraceEnabled)
                 Log.Instance.Trace($"Process {process.Id} exited.");
 
-            var staleProcesses = _processCache.RemoveWhere(p => p.HasExited);
+            var staleProcesses = _processCache.RemoveWhere(p =>
+            {
+                try { return p.HasExited; }
+                catch { return true; }
+            });
+
             if (staleProcesses > 1)
             {
                 if (Log.Instance.IsTraceEnabled)

diff --git a/LenovoLegionToolkit.Lib/AutoListeners/ProcessAutoListener.cs b/LenovoLegionToolkit.Lib/AutoListeners/ProcessAutoListener.cs
@@ -112,11 +112,9 @@ private void InstanceStoppedEventAutoAutoListener_Changed(object? sender, (int p
             if (IgnoredNames.Contains(e.processName, StringComparer.InvariantCultureIgnoreCase))
                 return;
 
-            if (!_processCache.TryGetValue(e.processId, out var processInfo))
+            if (!_processCache.Remove(e.processId, out var processInfo))
                 return;
 
-            _processCache.Remove(e.processId);
-
             RaiseChanged(new(ProcessEventInfoType.Stopped, processInfo));
         }
     }