Merge branch 'development'

src/Artemis.Core/Models/Surface/LayoutSelection.cs

@@ -7,6 +7,7 @@ public class LayoutSelection : CorePropertyChanged
 {
     private string? _type;
     private string? _parameter;
+    private string? _errorState;
 
     /// <summary>
     ///     Gets or sets what kind of layout reference this is.
@@ -25,4 +26,13 @@ public class LayoutSelection : CorePropertyChanged
         get => _parameter;
         set => SetAndNotify(ref _parameter, value);
     }
+
+    /// <summary>
+    ///     Gets or sets the error state of the layout reference.
+    /// </summary>
+    public string? ErrorState
+    {
+        get => _errorState;
+        set => SetAndNotify(ref _errorState, value);
+    }
 }

src/Artemis.Core/Services/DeviceService.cs

@@ -184,13 +184,14 @@ internal class DeviceService : IDeviceService
                 device.ApplyLayout(null, false, false);
             else
                 provider?.ApplyLayout(device, layout);
+            
+            UpdateLeds();
         }
         catch (Exception e)
         {
+            device.LayoutSelection.ErrorState = e.Message;
             _logger.Error(e, "Failed to apply device layout");
         }
-
-        UpdateLeds();
     }
 
     /// <inheritdoc />