ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bugfix: moved validation inside lock

Browse source
This commit is contained in:
mayo 2025-11-01 17:20:16 -04:00
parent 0bf9fdea84
commit 1d7603bb8c
No known key found for this signature in database
GPG key ID: 5B138E78344184A6
1 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Penumbra/Collections/Manager/CollectionStorage.cs
View file

@ -201,22 +201,23 @@ public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable, ISer
/// </summary> /// </summary>
public bool RemoveCollection(ModCollection collection) public bool RemoveCollection(ModCollection collection)
{ {
if (collection.Identity.Index <= ModCollection.Empty.Identity.Index || collection.Identity.Index >= Count)
{
Penumbra.Messager.NotificationMessage("Can not remove the empty collection.", NotificationType.Error, false);
return false;
}
if (collection.Identity.Index == DefaultNamed.Identity.Index)
{
Penumbra.Messager.NotificationMessage("Can not remove the default collection.", NotificationType.Error, false);
return false;
}
Delete(collection);
_saveService.ImmediateDelete(new ModCollectionSave(_modStorage, collection));
lock (_collectionsLock) lock (_collectionsLock)
{ {
if (collection.Identity.Index <= ModCollection.Empty.Identity.Index || collection.Identity.Index >= Count)
{
Penumbra.Messager.NotificationMessage("Can not remove the empty collection.", NotificationType.Error, false);
return false;
}
if (collection.Identity.Index == DefaultNamed.Identity.Index)
{
Penumbra.Messager.NotificationMessage("Can not remove the default collection.", NotificationType.Error, false);
return false;
}
Delete(collection);
_saveService.ImmediateDelete(new ModCollectionSave(_modStorage, collection));
_collections.RemoveAt(collection.Identity.Index); _collections.RemoveAt(collection.Identity.Index);
// Update indices. // Update indices.
for (var i = collection.Identity.Index; i < _collections.Count; ++i) for (var i = collection.Identity.Index; i < _collections.Count; ++i)