Merge pull request #440 from aalmada/SetGlobalListener

Unregister global listeners on destroy

Author: NeerajW

Assets/HoloToolkit-Examples/SharingWithUNET/Scripts/PlayerController.cs

@@ -78,6 +78,14 @@ private void Start()
             transform.SetParent(sharedWorldAnchorTransform);
         }
 
+        private void OnDestroy()
+        {
+            if (isLocalPlayer)
+            {
+                InputManager.Instance.RemoveGlobalListener(gameObject);
+            }
+        }
+
         private void Update()
         {
             // If we aren't the local player, we just need to make sure that the position of this object is set properly

Assets/HoloToolkit-Examples/SpatialUnderstanding/SpatialUnderstanding-FeatureOverview/Scripts/AppState.cs

@@ -198,6 +198,11 @@ private void Start()
         InputManager.Instance.AddGlobalListener(gameObject);
     }
 
+    protected override void OnDestroy()
+    {
+        InputManager.Instance.RemoveGlobalListener(gameObject);
+    }
+
     private void Update_DebugDisplay(float deltaTime)
     {
         // Basic checks

Assets/HoloToolkit/Input/Scripts/SetGlobalListener.cs

@@ -14,5 +14,10 @@ private void Start()
         {
             InputManager.Instance.AddGlobalListener(gameObject);
         }
+
+        private void OnDestroy()
+        {
+            InputManager.Instance.RemoveGlobalListener(gameObject);
+        }
     }
 }