Fixed NullReferenceException error.

Snow1226 · Mar 30, 2020 · 6fda390 · 6fda390
1 parent 8ae3c0b
commit 6fda390
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/CameraPlus/CameraUtilities.cs b/CameraPlus/CameraUtilities.cs
@@ -137,11 +137,19 @@ string msg
             return false;
         }
 
-        public static void SetAllCamerCulling()
+        public static void SetAllCameraCulling()
         {
-            foreach (CameraPlusInstance c in Plugin.Instance.Cameras.Values.ToArray())
+            try
             {
-                c.Instance.SetCullingMask();
+                foreach (CameraPlusInstance c in Plugin.Instance.Cameras.Values.ToArray())
+                {
+                    c.Instance.SetCullingMask();
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.Log($"Exception cameras culling! Exception:" +
+                    $" {ex.Message}\n{ex.StackTrace}", LogLevel.Error);
             }
         }
 

diff --git a/CameraPlus/Plugin.cs b/CameraPlus/Plugin.cs
@@ -68,10 +68,10 @@ private IEnumerator DelayedActiveSceneChanged(Scene from, Scene to)
             // If any new cameras have been added to the config folder, render them
            // if(to.name == )
             CameraUtilities.ReloadCameras();
-            CameraUtilities.SetAllCamerCulling();
 
             if (ActiveSceneChanged != null)
             {
+                CameraUtilities.SetAllCameraCulling();
                 // Invoke each activeSceneChanged event
                 foreach (var func in ActiveSceneChanged?.GetInvocationList())
                 {

diff --git a/README.md b/README.md
@@ -71,7 +71,7 @@ Edit that file to configure CameraPlus:
 ## Movement Script
 The sample script described in MovementScriptPath is located in the Beat Saber \ UserData \ CameraPlus \ Scripts folder.
 
-# If ActiveInPauseMenu is set to false, there is a bug that the script doesn't return to its original state when SteamVR screen is displayed. # 
+### If ActiveInPauseMenu is set to false, there is a bug that the script doesn't return to its original state when SteamVR screen is displayed. 
 ```xml
 {
     "ActiveInPauseMenu": true,     "ActiveInPauseMenu": Determines whether the camera pauses when pausing the game.