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

Fixed locks in RGBSurface

Browse Source
This commit is contained in:
Darth Affe 2021-09-06 01:15:46 +02:00
parent ef12e402ea
commit 924b121f64
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
RGB.NET.Core/RGBSurface.cs
View File

@ -13,6 +13,7 @@ namespace RGB.NET.Core
/// <inheritdoc cref="IDisposable" /> /// <inheritdoc cref="IDisposable" />
/// <summary> /// <summary>
/// Represents a RGB-surface containing multiple devices. /// Represents a RGB-surface containing multiple devices.
/// Represents a RGB-surface containing multiple devices.
/// </summary> /// </summary>
public sealed class RGBSurface : AbstractBindable, IDisposable public sealed class RGBSurface : AbstractBindable, IDisposable
{ {
@ -46,7 +47,7 @@ namespace RGB.NET.Core
{ {
get get
{ {
lock (_devices) lock (Devices)
return _devices.SelectMany(x => x); return _devices.SelectMany(x => x);
} }
} }
@ -142,8 +143,8 @@ namespace RGB.NET.Core
bool render = customData["render"] as bool? ?? true; bool render = customData["render"] as bool? ?? true;
bool updateDevices = customData["updateDevices"] as bool? ?? true; bool updateDevices = customData["updateDevices"] as bool? ?? true;
lock (_updateTriggers) lock (UpdateTriggers)
lock (_devices) lock (Devices)
{ {
OnUpdating(updateTrigger, customData); OnUpdating(updateTrigger, customData);
@ -174,7 +175,7 @@ namespace RGB.NET.Core
public void Dispose() public void Dispose()
{ {
List<IRGBDevice> devices; List<IRGBDevice> devices;
lock (_devices) lock (Devices)
devices = new List<IRGBDevice>(_devices); devices = new List<IRGBDevice>(_devices);
foreach (IRGBDevice device in devices) foreach (IRGBDevice device in devices)
@ -263,7 +264,7 @@ namespace RGB.NET.Core
/// <param name="device">The <see cref="IRGBDevice"/> to attach.</param> /// <param name="device">The <see cref="IRGBDevice"/> to attach.</param>
public void Attach(IRGBDevice device) public void Attach(IRGBDevice device)
{ {
lock (_devices) lock (Devices)
{ {
if (string.IsNullOrWhiteSpace(device.DeviceInfo.DeviceName)) throw new RGBDeviceException($"The device '{device.DeviceInfo.Manufacturer} {device.DeviceInfo.Model}' has no valid name."); if (string.IsNullOrWhiteSpace(device.DeviceInfo.DeviceName)) throw new RGBDeviceException($"The device '{device.DeviceInfo.Manufacturer} {device.DeviceInfo.Model}' has no valid name.");
if (device.Surface != null) throw new RGBSurfaceException($"The device '{device.DeviceInfo.DeviceName}' is already attached to a surface."); if (device.Surface != null) throw new RGBSurfaceException($"The device '{device.DeviceInfo.DeviceName}' is already attached to a surface.");
@ -283,7 +284,7 @@ namespace RGB.NET.Core
/// <returns><c>true</c> if the <see cref="IRGBDevice"/> could be detached; <c>false</c> otherwise.</returns> /// <returns><c>true</c> if the <see cref="IRGBDevice"/> could be detached; <c>false</c> otherwise.</returns>
public void Detach(IRGBDevice device) public void Detach(IRGBDevice device)
{ {
lock (_devices) lock (Devices)
{ {
if (!_devices.Contains(device)) throw new RGBSurfaceException($"The device '{device.DeviceInfo.DeviceName}' is not attached to this surface."); if (!_devices.Contains(device)) throw new RGBSurfaceException($"The device '{device.DeviceInfo.DeviceName}' is not attached to this surface.");
@ -310,7 +311,7 @@ namespace RGB.NET.Core
private void UpdateSurfaceRectangle() private void UpdateSurfaceRectangle()
{ {
lock (_devices) lock (Devices)
{ {
Rectangle devicesRectangle = new(_devices.Select(d => d.Boundary)); Rectangle devicesRectangle = new(_devices.Select(d => d.Boundary));
Boundary = Boundary.SetSize(new Size(devicesRectangle.Location.X + devicesRectangle.Size.Width, devicesRectangle.Location.Y + devicesRectangle.Size.Height)); Boundary = Boundary.SetSize(new Size(devicesRectangle.Location.X + devicesRectangle.Size.Width, devicesRectangle.Location.Y + devicesRectangle.Size.Height));