Fix: Added missing checks for removing a DependencyCollection in the …

…resolver
guerro323 · Mar 20, 2022 · 71f8a38 · 71f8a38
1 parent 9c612de
commit 71f8a38
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/revghost/Injection/DependencyCollection.cs b/revghost/Injection/DependencyCollection.cs
@@ -120,7 +120,12 @@ public bool TryResolve(out bool canStillBeResolvedSynchronously)
             onFinalList.Clear();
         }
 
-        return Queued.Count == 0;
+        if (Queued.Count != 0) 
+            return true;
+
+        canStillBeResolvedSynchronously = false;
+        return false;
+
     }
 
     public void Dispose()

diff --git a/revghost/Injection/SchedulerDependencyResolver.cs b/revghost/Injection/SchedulerDependencyResolver.cs
@@ -21,7 +21,8 @@ public class SchedulerDependencyResolver : IDependencyResolver, IDisposable
             bool wantToContinue;
             do
             {
-                collection.TryResolve(out wantToContinue);
+                if (!collection.TryResolve(out wantToContinue))
+                    break;
             } while (wantToContinue);
 
             if (collection.Dependencies.IsEmpty)

diff --git a/revghost/revghost.csproj b/revghost/revghost.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
         <LangVersion>10</LangVersion>
-        <VersionPrefix>2022.0220.1631</VersionPrefix>
+        <VersionPrefix>2022.0320.1317</VersionPrefix>
         <Copyright>guerro323</Copyright>
         <PackageProjectUrl>https://github.com/guerro323/GameHost</PackageProjectUrl>
         <PackageLicenseUrl>https://github.com/guerro323/GameHost/blob/v3-dev/LICENSE</PackageLicenseUrl>