mirror of
https://github.com/xivdev/Penumbra.git
synced 2025-12-30 12:23:41 +01:00
Some more shuffling around.
This commit is contained in:
parent
a94c5ae7af
commit
ce03fb59c8
9 changed files with 147 additions and 138 deletions
|
|
@ -43,7 +43,7 @@ public class ActiveCollections : ISavable, IDisposable
|
|||
Current = storage.DefaultNamed;
|
||||
Default = storage.DefaultNamed;
|
||||
Interface = storage.DefaultNamed;
|
||||
Individuals = new IndividualCollections(actors.AwaitedService, config);
|
||||
Individuals = new IndividualCollections(actors, config);
|
||||
_communicator.CollectionChange.Subscribe(OnCollectionChange, -100);
|
||||
LoadCollections();
|
||||
UpdateCurrentCollectionInUse();
|
||||
|
|
@ -396,7 +396,7 @@ public class ActiveCollections : ISavable, IDisposable
|
|||
}
|
||||
|
||||
configChanged |= ActiveCollectionMigration.MigrateIndividualCollections(_storage, Individuals, jObject);
|
||||
configChanged |= Individuals.ReadJObject(jObject[nameof(Individuals)] as JArray, _storage);
|
||||
configChanged |= Individuals.ReadJObject(_saveService, this, jObject[nameof(Individuals)] as JArray, _storage);
|
||||
|
||||
// Save any changes.
|
||||
if (configChanged)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue