diff --git a/Penumbra/Collections/CollectionManager.Active.cs b/Penumbra/Collections/CollectionManager.Active.cs index f06a574f..c75b7e44 100644 --- a/Penumbra/Collections/CollectionManager.Active.cs +++ b/Penumbra/Collections/CollectionManager.Active.cs @@ -81,11 +81,14 @@ public partial class ModCollection break; } - CurrentCollectionInUse = Characters.Values.Prepend( Default ).SelectMany( c => c.GetFlattenedInheritance() ).Contains( Current ); - + + UpdateCurrentCollectionInUse(); CollectionChanged.Invoke( type, this[ oldCollectionIdx ], newCollection, characterName ); } + private void UpdateCurrentCollectionInUse() + => CurrentCollectionInUse = Characters.Values.Prepend( Default ).SelectMany( c => c.GetFlattenedInheritance() ).Contains( Current ); + public void SetCollection( ModCollection collection, Type type, string? characterName = null ) => SetCollection( collection.Index, type, characterName ); diff --git a/Penumbra/Collections/CollectionManager.cs b/Penumbra/Collections/CollectionManager.cs index 76515f0c..411e7de5 100644 --- a/Penumbra/Collections/CollectionManager.cs +++ b/Penumbra/Collections/CollectionManager.cs @@ -72,6 +72,7 @@ public partial class ModCollection CollectionChanged += SaveOnChange; ReadCollections(); LoadCollections(); + UpdateCurrentCollectionInUse(); } public void Dispose()