Don't dare Amethyst to crash so often

Author: meruune

external/manifest.json

@@ -1,5 +1,5 @@
 {
-    "version": "1.0.0.2",
+    "version": "1.0.0.3",
     "display_name": "Amethyst Tracking Relay",
     "download": "plugin_Relay.zip",
     "changelog": "New transport layer.",

plugin_Relay/RelayDevice.cs

@@ -27,7 +27,7 @@ namespace plugin_Relay;
 [ExportMetadata("Name", "Amethyst Tracking Relay")]
 [ExportMetadata("Guid", "K2VRTEAM-AME2-APII-DVCE-TRACKINGRELAY")]
 [ExportMetadata("Publisher", "K2VR Team")]
-[ExportMetadata("Version", "1.0.0.1")]
+[ExportMetadata("Version", "1.0.0.3")]
 [ExportMetadata("Website", "https://github.com/KimihikoAkayasaki/plugin_Relay")]
 public class RelayDevice : ITrackingDevice
 {

plugin_Relay/RelayService.cs

@@ -30,7 +30,7 @@ namespace plugin_Relay;
 [ExportMetadata("Name", "Amethyst Tracking Relay")]
 [ExportMetadata("Guid", "K2VRTEAM-AME2-APII-DVCE-TRACKINGRELAY")]
 [ExportMetadata("Publisher", "K2VR Team")]
-[ExportMetadata("Version", "1.0.0.1")]
+[ExportMetadata("Version", "1.0.0.3")]
 [ExportMetadata("Website", "https://github.com/KimihikoAkayasaki/plugin_Relay")]
 public class RelayService : IServiceEndpoint
 {
@@ -167,10 +167,17 @@ public TrackerBase GetTrackerPose(string contains, bool canBeFromAmethyst = true
     public void Heartbeat()
     {
         if (ServiceStatus != 0 || Host is null) return;
-        lock (Host.UpdateThreadLock)
+        try
         {
-            DevicesToUpdate.Select(guid => _trackingDevices.GetValueOrDefault(guid, null))
-                .Where(x => x is not null).Where(x => !x.IsSelfUpdateEnabled).ToList().ForEach(x => x.Update());
+            lock (Host.UpdateThreadLock)
+            {
+                DevicesToUpdate.Select(guid => _trackingDevices.GetValueOrDefault(guid, null))
+                    .Where(x => x is not null).Where(x => !x.IsSelfUpdateEnabled).ToList().ForEach(x => x.Update());
+            }
+        }
+        catch (Exception ex)
+        {
+            Host?.Log(ex);
         }
     }
 
@@ -455,7 +462,12 @@ public async Task<TrackingDevice> GetTrackingDevice(string guid, CancellationTok
     public async Task<List<TrackedJoint>> GetTrackedJoints(string guid, CancellationToken cancellationToken = default)
     {
         if (RelayService.Instance is null) return null;
-        RelayService.Instance.DevicesToUpdate.Add(guid); // Mark the device as used
+        if (!RelayService.Instance.DevicesToUpdate.Contains(guid))
+            lock (RelayService.Instance.Host.UpdateThreadLock)
+            {
+                RelayService.Instance.DevicesToUpdate.Add(guid); // Mark the device as used
+            }
+
         var device = RelayService.Instance.GetTrackingDevice(guid);
         return device.IsSkeletonTracked ? device.TrackedJoints.ToList() : null;
     }