Merge pull request #2571 from StephenHodgson/vNEXT-TeleportCleanup

Cleaned up event system if teleport system creates one.

Author: David Kline

Assets/MixedRealityToolkit-SDK/Features/Teleportation/MixedRealityTeleportManager.cs

@@ -24,6 +24,11 @@ public class MixedRealityTeleportManager : MixedRealityEventManager, IMixedReali
         private Vector3 targetPosition = Vector3.zero;
         private Vector3 targetRotation = Vector3.zero;
 
+        /// <summary>
+        /// only used to clean up event system when shutting down if this system created one.
+        /// </summary>
+        private GameObject eventSystemReference;
+
         #region IMixedRealityManager Implementation
 
         /// <inheritdoc />
@@ -54,7 +59,8 @@ private void InitializeInternal()
                 {
                     if (!MixedRealityManager.Instance.ActiveProfile.IsInputSystemEnabled)
                     {
-                        new GameObject("Event System").AddComponent<EventSystem>();
+                        eventSystemReference = new GameObject("Event System");
+                        eventSystemReference.AddComponent<EventSystem>();
                     }
                     else
                     {
@@ -72,6 +78,24 @@ private void InitializeInternal()
             teleportEventData = new TeleportEventData(EventSystem.current);
         }
 
+        /// <inheritdoc />
+        public override void Destroy()
+        {
+            base.Destroy();
+
+            if (eventSystemReference != null)
+            {
+                if (Application.isEditor)
+                {
+                    Object.DestroyImmediate(eventSystemReference);
+                }
+                else
+                {
+                    Object.Destroy(eventSystemReference);
+                }
+            }
+        }
+
         #endregion IMixedRealityManager Implementation
 
         #region IEventSystemManager Implementation