Use lock when updating devices.

immense · May 7, 2021 · 6a64e2d · 6a64e2d
1 parent d2a28ce
commit 6a64e2d
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/Server/Components/Devices/DevicesFrame.razor.cs b/Server/Components/Devices/DevicesFrame.razor.cs
@@ -27,6 +27,7 @@ namespace Remotely.Server.Components.Devices
     [Authorize]
     public partial class DevicesFrame : AuthComponentBase, IDisposable
     {
+        private readonly object _devicesLock = new();
         private readonly List<Device> _allDevices = new();
         private readonly string _deviceGroupAll = Guid.NewGuid().ToString();
         private readonly string _deviceGroupNone = Guid.NewGuid().ToString();
@@ -89,8 +90,11 @@ public void Dispose()
 
         public void Refresh()
         {
-            LoadDevices();
-            InvokeAsync(StateHasChanged);
+            lock (_devicesLock)
+            {
+                LoadDevices();
+                InvokeAsync(StateHasChanged);
+            }
         }
 
         protected override async Task OnInitializedAsync()
@@ -112,15 +116,21 @@ protected override async Task OnInitializedAsync()
 
             _sortableProperties.AddRange(sortableProperties);
 
-            LoadDevices();
+            lock (_devicesLock)
+            {
+                LoadDevices();
+            }
         }
 
         protected override bool ShouldRender()
         {
             var shouldRender = base.ShouldRender();
             if (shouldRender)
             {
-                FilterDevices();
+                lock (_devicesLock)
+                {
+                    FilterDevices();
+                }
             }
             return shouldRender;
         }