DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-31 17:53:32 +00:00
Code Issues Releases Wiki Activity

Device providers - Fixed an issue removing device providers

Browse Source 
Surface auto-arrange - Fixed a crash when arranging with no devices
This commit is contained in:
Robert 2021-02-25 20:40:04 +01:00
parent a9d6b17aa4
commit af4bf79936
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Artemis.Core/Services/RgbService.cs
View File

@ -74,7 +74,7 @@ namespace Artemis.Core.Services
_modifyingProviders = true; _modifyingProviders = true;
List<ArtemisDevice> toRemove = _devices.Where(a => deviceProvider.Devices.Any(d => a.RgbDevice == d)).ToList(); List<ArtemisDevice> toRemove = _devices.Where(a => deviceProvider.Devices.Any(d => a.RgbDevice == d)).ToList();
Surface.Detach(deviceProvider.Devices); Surface.Detach(toRemove.Select(d => d.RgbDevice));
foreach (ArtemisDevice device in toRemove) foreach (ArtemisDevice device in toRemove)
RemoveDevice(device); RemoveDevice(device);
@ -118,7 +118,7 @@ namespace Artemis.Core.Services
_modifyingProviders = true; _modifyingProviders = true;
List<ArtemisDevice> toRemove = _devices.Where(a => deviceProvider.Devices.Any(d => a.RgbDevice == d)).ToList(); List<ArtemisDevice> toRemove = _devices.Where(a => deviceProvider.Devices.Any(d => a.RgbDevice == d)).ToList();
Surface.Detach(deviceProvider.Devices); Surface.Detach(toRemove.Select(d => d.RgbDevice));
foreach (ArtemisDevice device in toRemove) foreach (ArtemisDevice device in toRemove)
RemoveDevice(device); RemoveDevice(device);

5
src/Artemis.Core/Services/Storage/Models/SurfaceArrangement.cs
View File

@ -79,6 +79,11 @@ namespace Artemis.Core.Services.Models
public void Arrange(List<ArtemisDevice> devices) public void Arrange(List<ArtemisDevice> devices)
{ {
ArrangedDevices.Clear(); ArrangedDevices.Clear();
// Not much to do here
if (!devices.Any())
return;
foreach (ArtemisDevice surfaceDevice in devices) foreach (ArtemisDevice surfaceDevice in devices)
{ {
surfaceDevice.X = 0; surfaceDevice.X = 0;