Fixed a bug where a source lost/detected on different threads came through in the wrong order

Author: keveleigh

Assets/HoloToolkit/Input/Scripts/ControllerVisualizer.cs

@@ -74,6 +74,7 @@ private void Start()
                 if (spatialInteractionManager != null)
                 {
                     spatialInteractionManager.SourceDetected += SpatialInteractionManager_SourceDetected;
+                    spatialInteractionManager.SourceLost += SpatialInteractionManager_SourceLost;
                 }
             }, true);
 #else
@@ -88,8 +89,8 @@ private void Start()
             }
 
             InteractionManager.InteractionSourceDetected += InteractionManager_InteractionSourceDetected;
-#endif
             InteractionManager.InteractionSourceLost += InteractionManager_InteractionSourceLost;
+#endif
             InteractionManager.InteractionSourceUpdated += InteractionManager_InteractionSourceUpdated;
 #endif
         }
@@ -120,6 +121,24 @@ private void SpatialInteractionManager_SourceDetected(SpatialInteractionManager
             }
         }
 
+        private void SpatialInteractionManager_SourceLost(SpatialInteractionManager sender, SpatialInteractionSourceEventArgs args)
+        {
+            SpatialInteractionSource source = args.State.Source;
+            if (source.Kind == SpatialInteractionSourceKind.Controller)
+            {
+                ControllerInfo controller;
+                if (controllerDictionary != null && controllerDictionary.TryGetValue(source.Id, out controller))
+                {
+                    controllerDictionary.Remove(source.Id);
+
+                    UnityEngine.WSA.Application.InvokeOnAppThread(() =>
+                    {
+                        Destroy(controller);
+                    }, false);
+                }
+            }
+        }
+
         private IEnumerator LoadControllerModel(SpatialInteractionController controller, SpatialInteractionSource source)
         {
             GameObject controllerModelGameObject;