DarthAffe/RGB.NET
1
0
Fork 0
mirror of https://github.com/DarthAffe/RGB.NET.git synced 2025-12-13 01:58:30 +00:00
Code Issues Releases Wiki Activity

Merge pull request #90 from DarthAffe/Fix/DecoratorConcurrency

Browse Source 
Prevented concurrent list operations when modifying decorators
This commit is contained in:
DarthAffe 2019-11-21 20:43:35 +01:00 committed by GitHub
commit c220388188
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
RGB.NET.Core/Brushes/AbstractBrush.cs
View File

@ -78,9 +78,10 @@ namespace RGB.NET.Core
/// <param name="color">The <see cref="Color"/> to be modified.</param>
protected virtual Color ApplyDecorators(Rectangle rectangle, BrushRenderTarget renderTarget, Color color)
{
foreach (IBrushDecorator decorator in Decorators)
if (decorator.IsEnabled)
color = decorator.ManipulateColor(rectangle, renderTarget, color);
lock (Decorators)
foreach (IBrushDecorator decorator in Decorators)
if (decorator.IsEnabled)
color = decorator.ManipulateColor(rectangle, renderTarget, color);
return color;
}

30
RGB.NET.Core/Decorators/AbstractDecorateable.cs
View File

@ -11,11 +11,20 @@ namespace RGB.NET.Core
{
#region Properties & Fields
private List<T> _decorators = new List<T>();
private readonly List<T> _decorators = new List<T>();
/// <summary>
/// Gets a readonly-list of all <see cref="IDecorator"/> attached to this <see cref="IDecoratable{T}"/>.
/// </summary>
protected IReadOnlyCollection<T> Decorators => new ReadOnlyCollection<T>(_decorators);
protected IReadOnlyCollection<T> Decorators { get; }
#endregion
#region Constructors
protected AbstractDecoratable()
{
Decorators = new ReadOnlyCollection<T>(_decorators);
}
#endregion
@ -24,8 +33,11 @@ namespace RGB.NET.Core
/// <inheritdoc />
public void AddDecorator(T decorator)
{
_decorators.Add(decorator);
_decorators = _decorators.OrderByDescending(x => x.Order).ToList();
lock (Decorators)
{
_decorators.Add(decorator);
_decorators.Sort((d1, d2) => d1.Order.CompareTo(d2.Order));
}
decorator.OnAttached(this);
}
@ -33,7 +45,8 @@ namespace RGB.NET.Core
/// <inheritdoc />
public void RemoveDecorator(T decorator)
{
_decorators.Remove(decorator);
lock (Decorators)
_decorators.Remove(decorator);
decorator.OnDetached(this);
}
@ -41,7 +54,12 @@ namespace RGB.NET.Core
/// <inheritdoc />
public void RemoveAllDecorators()
{
foreach (T decorator in Decorators.ToList())
IEnumerable<T> decorators;
lock (Decorators)
decorators = Decorators.ToList();
foreach (T decorator in decorators)
RemoveDecorator(decorator);
}