Maybe sort race condition.

xivdev · May 1, 2023 · ee50994 · ee50994
1 parent a38a989
commit ee50994
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/Penumbra/Collections/Cache/CollectionCacheManager.cs b/Penumbra/Collections/Cache/CollectionCacheManager.cs
@@ -42,18 +42,20 @@ public CollectionCacheManager(FrameworkManager framework, CommunicatorService co
         _active         = active;
         _storage        = storage;
 
+        if (!_active.Individuals.IsLoaded)
+            _active.Individuals.Loaded += CreateNecessaryCaches;
         _communicator.CollectionChange.Subscribe(OnCollectionChange, -100);
         _communicator.ModPathChanged.Subscribe(OnModChangeAddition, -100);
         _communicator.ModPathChanged.Subscribe(OnModChangeRemoval,  100);
         _communicator.TemporaryGlobalModChange.Subscribe(OnGlobalModChange);
         _communicator.ModOptionChanged.Subscribe(OnModOptionChange, -100);
         _communicator.ModSettingChanged.Subscribe(OnModSettingChange);
         _communicator.CollectionInheritanceChanged.Subscribe(OnCollectionInheritanceChange);
-        CreateNecessaryCaches();
-        _active.Individuals.Loaded += CreateNecessaryCaches;
 
         if (!MetaFileManager.CharacterUtility.Ready)
             MetaFileManager.CharacterUtility.LoadingFinished += IncrementCounters;
+
+        CreateNecessaryCaches();
     }
 
     public void Dispose()
@@ -303,6 +305,7 @@ private void CreateNecessaryCaches()
             .Select(c => Task.Run(() => CalculateEffectiveFileListInternal(c)))
             .ToArray();
 
+        Penumbra.Log.Debug($"Creating {tasks.Length} necessary caches.");
         Task.WaitAll(tasks);
     }
 }
diff --git a/Penumbra/Collections/Manager/ActiveCollections.cs b/Penumbra/Collections/Manager/ActiveCollections.cs
@@ -43,7 +43,7 @@ public ActiveCollections(Configuration config, CollectionStorage storage, ActorS
         Current       = storage.DefaultNamed;
         Default       = storage.DefaultNamed;
         Interface     = storage.DefaultNamed;
-        Individuals   = new IndividualCollections(actors, config);
+        Individuals   = new IndividualCollections(actors, config, false);
         _communicator.CollectionChange.Subscribe(OnCollectionChange, -100);
         LoadCollections();
         UpdateCurrentCollectionInUse();

diff --git a/Penumbra/Collections/Manager/IndividualCollections.Files.cs b/Penumbra/Collections/Manager/IndividualCollections.Files.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Dalamud.Game;
 using Dalamud.Game.ClientState.Objects.Enums;
 using Dalamud.Interface.Internal.Notifications;
 using Newtonsoft.Json.Linq;
@@ -37,6 +36,7 @@ void Func()
             {
                 if (ReadJObjectInternal(obj, storage))
                     saver.ImmediateSave(parent);
+                IsLoaded = true;
                 Loaded.Invoke();
                 _actorService.FinishedCreation -= Func;
             });

diff --git a/Penumbra/Collections/Manager/IndividualCollections.cs b/Penumbra/Collections/Manager/IndividualCollections.cs
@@ -18,14 +18,16 @@ public sealed partial class IndividualCollections
     private readonly Dictionary<ActorIdentifier, ModCollection>                                                       _individuals = new();
 
     public event Action Loaded;
+    public bool         IsLoaded { get; private set; }
 
     public IReadOnlyList<(string DisplayName, IReadOnlyList<ActorIdentifier> Identifiers, ModCollection Collection)> Assignments
         => _assignments;
 
-    public IndividualCollections(ActorService actorService, Configuration config)
+    public IndividualCollections(ActorService actorService, Configuration config, bool temporary)
     {
         _config       =  config;
         _actorService =  actorService;
+        IsLoaded      =  temporary;
         Loaded        += () => Penumbra.Log.Information($"{_assignments.Count} Individual Assignments loaded after delay.");
     }
 

diff --git a/Penumbra/Collections/Manager/TempCollectionManager.cs b/Penumbra/Collections/Manager/TempCollectionManager.cs
@@ -25,7 +25,7 @@ public TempCollectionManager(Configuration config, CommunicatorService communica
         _communicator = communicator;
         _actors       = actors;
         _storage      = storage;
-        Collections   = new IndividualCollections(actors, config);
+        Collections   = new IndividualCollections(actors, config, true);
 
         _communicator.TemporaryGlobalModChange.Subscribe(OnGlobalModChange);
     }