return a null camera if we're shutting down

XRTK · Nov 6, 2019 · d408f1d · d408f1d
1 parent 7b15db0
commit d408f1d
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/XRTK-Core/Packages/com.xrtk.core/Utilities/CameraCache.cs b/XRTK-Core/Packages/com.xrtk.core/Utilities/CameraCache.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEngine;
+using XRTK.Services;
 
 namespace XRTK.Utilities
 {
@@ -24,6 +25,11 @@ public static Camera Main
 
                 if (mainCamera == null)
                 {
+                    if (MixedRealityToolkit.IsApplicationQuitting)
+                    {
+                        return null;
+                    }
+
                     mainCamera = new GameObject("Main Camera", typeof(Camera), typeof(AudioListener)) { tag = "MainCamera" }.GetComponent<Camera>();
                 }