Merge branch 'stakira:master' into master

xunmengshe · Feb 4, 2024 · fcdb7e1 · fcdb7e1
2 parents 010d970 + 3b316a4
commit fcdb7e1
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/OpenUtau.Core/SingerManager.cs b/OpenUtau.Core/SingerManager.cs
@@ -119,19 +119,18 @@ public class SingerManager : SingletonBase<SingerManager> {
             var singersInUse = new HashSet<USinger>();
             foreach(var track in project.tracks){
                 var singer = track.Singer;
-                if(singer != null){
+                if(singer != null && singer.Found && !singersInUse.Contains(singer)) {
                     singersInUse.Add(singer);
                 }
             }
             //Release singers that are no longer in use
             foreach(var singer in singersUsed){
                 if(!singersInUse.Contains(singer)){
                     singer.FreeMemory();
-                    singersUsed.Remove(singer);
                 }
             }
             //Update singers used
-            singersUsed.UnionWith(singersInUse);
+            singersUsed = singersInUse;
         }
     }
 }