Merge pull request #2429 from erri120/fix/exception-on-remove

Exit early when Loadout doesn't exist anymore
Nexus-Mods · Jan 6, 2025 · 9dc0ec6 · 9dc0ec6
2 parents d6775ea + 06bc860
commit 9dc0ec6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/NexusMods.DataModel/Diagnostics/DiagnosticManager.cs b/src/NexusMods.DataModel/Diagnostics/DiagnosticManager.cs
@@ -48,11 +48,12 @@ public IObservable<Diagnostic[]> GetLoadoutDiagnostics(LoadoutId loadoutId)
                 {
                     var db = _connection.Db;
                     var loadout = Loadout.Load(db, loadoutId);
+                    if (!loadout.IsValid()) return [];
+
                     try
                     {
                         // TODO: cancellation token
-                        // TODO: optimize this a bit so we don't load the model twice, we have the datoms above, we should
-                        // be able to use them
+                        // TODO: optimize this a bit so we don't load the model twice, we have the datoms above, we should be able to use them
 
                         var cancellationToken = CancellationToken.None;
                         return await GetLoadoutDiagnostics(loadout, cancellationToken);
@@ -70,6 +71,7 @@ public IObservable<Diagnostic[]> GetLoadoutDiagnostics(LoadoutId loadoutId)
             return connectableObservable;
         }
     }
+
     private async Task<Diagnostic[]> GetLoadoutDiagnostics(Loadout.ReadOnly loadout, CancellationToken cancellationToken)
     {
         var diagnosticEmitters = loadout.InstallationInstance.GetGame().DiagnosticEmitters;