From 27650708f02ff77b1758b52b9878b548d9025b7e Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Sat, 18 Jun 2022 12:45:04 +0200
Subject: [PATCH] Fix collection in use not updating on first load.

---
 Penumbra/Collections/CollectionManager.Active.cs | 7 +++++--
 Penumbra/Collections/CollectionManager.cs        | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

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()