SmartEyeTracker is properly closed when refreshing trackers list

iTrace-Dev · May 16, 2022 · 6927691 · 6927691
1 parent 780eb5d
commit 6927691
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/itrace_core/SmartEyeTracker.cs b/itrace_core/SmartEyeTracker.cs
@@ -165,6 +165,18 @@ public SmartEyeTracker()
             TrackerInit();
         }
 
+        //Disconnect any connections, performed before refreshing the tracker list
+        public void CleanupConnections()
+        {
+            if (LatentClient.Connected)
+                LatentClient.Close();
+
+            if (RpcClient.Connected)
+                RpcClient.Close();
+
+            RealtimeClient.Close();
+        }
+
         //Retrieve the World Model and calibration error vectors. Returns true on success
         private Boolean GetWorldCalibration()
         {

diff --git a/itrace_core/TrackerManager.cs b/itrace_core/TrackerManager.cs
@@ -28,6 +28,14 @@ public TrackerManager()
 
         public void FindTrackers()
         {
+            //Ensure all trackers are cleaned up (Namely SmartEye must be fully disconnected)
+            foreach (ITracker tracker in EyeTrackers)
+            {
+                //Consider making this common to ITracker
+                if (tracker is SmartEyeTracker)
+                    ((SmartEyeTracker)tracker).CleanupConnections();
+            }
+
             EyeTrackers.Clear();
             EyeTrackers.Add(new MouseTracker());
             FindTobiiDevices();