sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 09:57:21 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3397 from peppy/fix-collection-modified

Browse Source 
Fix thread-safety of queued events list in ArchiveModelManager
This commit is contained in:
Dan Balasescu 2018-09-13 11:53:56 +09:00 committed by GitHub
commit dbcbd82554
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Database/ArchiveModelManager.cs
View File

@ -59,7 +59,7 @@ namespace osu.Game.Database
// ReSharper disable once NotAccessedField.Local (we should keep a reference to this so it is not finalised) // ReSharper disable once NotAccessedField.Local (we should keep a reference to this so it is not finalised)
private ArchiveImportIPCChannel ipc; private ArchiveImportIPCChannel ipc;
private readonly List<Action> cachedEvents = new List<Action>(); private readonly List<Action> queuedEvents = new List<Action>();
/// <summary> /// <summary>
/// Allows delaying of outwards events until an operation is confirmed (at a database level). /// Allows delaying of outwards events until an operation is confirmed (at a database level).
@ -77,20 +77,26 @@ namespace osu.Game.Database
/// <param name="perform">Whether the flushed events should be performed.</param> /// <param name="perform">Whether the flushed events should be performed.</param>
private void flushEvents(bool perform) private void flushEvents(bool perform)
{ {
Action[] events;
lock (queuedEvents)
{
events = queuedEvents.ToArray();
queuedEvents.Clear();
}
if (perform) if (perform)
{ {
foreach (var a in cachedEvents) foreach (var a in events)
a.Invoke(); a.Invoke();
} }
cachedEvents.Clear();
delayingEvents = false; delayingEvents = false;
} }
private void handleEvent(Action a) private void handleEvent(Action a)
{ {
if (delayingEvents) if (delayingEvents)
cachedEvents.Add(a); lock (queuedEvents) queuedEvents.Add(a);
else else
a.Invoke(); a.Invoke();
} }