[RealPOV][KK/KKS] Fix crashing after leaving H scene with POV enabled

IllusionMods · Mar 16, 2023 · a7b82fc · a7b82fc
1 parent 1cb6ea8
commit a7b82fc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/src/RealPOV.Core.Koikatu/RealPOV.cs b/src/RealPOV.Core.Koikatu/RealPOV.cs
@@ -18,7 +18,7 @@ namespace RealPOV.Koikatu
     [BepInDependency(KKAPI.KoikatuAPI.GUID)]
     public class RealPOV : RealPOVCore
     {
-        public const string Version = "1.3.1." + BuildNumber.Version;
+        public const string Version = "1.3.2." + BuildNumber.Version;
 
         private ConfigEntry<bool> HideHead { get; set; }
 
@@ -107,7 +107,7 @@ Queue<ChaControl> CreateQueue()
                     {
                         return new Queue<ChaControl>(FindObjectsOfType<ChaControl>());
                     }
-                    
+
                     ChaControl GetCurrentChara()
                     {
                         for(int i = 0; i < charaQueue.Count; i++)
@@ -149,7 +149,7 @@ ChaControl GetCurrentChara()
                 GameCamera = Camera.main;
                 var cc = (MonoBehaviour)GameCamera.GetComponent<CameraControl_Ver2>() ?? GameCamera.GetComponent<Studio.CameraControl>();
                 if(cc) cc.enabled = false;
-                
+
                 // Fix depth of field being completely out of focus
                 var depthOfField = GameCamera.GetComponent<UnityStandardAssets.ImageEffects.DepthOfField>();
                 dofOrigSize = depthOfField.focalSize;
@@ -190,16 +190,20 @@ protected override void DisablePov()
             currentChara = null;
             currentCharaId = -1;
 
-            var cc = (MonoBehaviour)GameCamera.GetComponent<CameraControl_Ver2>() ?? GameCamera.GetComponent<Studio.CameraControl>();
-            if(cc) cc.enabled = true;
+            if(GameCamera != null)
+            {
+                var cc = (MonoBehaviour)GameCamera.GetComponent<CameraControl_Ver2>() ?? GameCamera.GetComponent<Studio.CameraControl>();
+                if(cc) cc.enabled = true;
 
-            var depthOfField = GameCamera.GetComponent<UnityStandardAssets.ImageEffects.DepthOfField>();
-            depthOfField.focalSize = dofOrigSize;
-            depthOfField.aperture = dofOrigAperature;
+                var depthOfField = GameCamera.GetComponent<UnityStandardAssets.ImageEffects.DepthOfField>();
+                depthOfField.focalSize = dofOrigSize;
+                depthOfField.aperture = dofOrigAperature;
+            }
 
             base.DisablePov();
 
-            GameCamera.gameObject.layer = backupLayer;
+            if(GameCamera != null)
+                GameCamera.gameObject.layer = backupLayer;
         }
 
         [HarmonyPrefix, HarmonyPatch(typeof(NeckLookControllerVer2), nameof(NeckLookControllerVer2.LateUpdate))]

diff --git a/src/RealPOV.Core/RealPOVCore.cs b/src/RealPOV.Core/RealPOVCore.cs
@@ -132,10 +132,15 @@ protected virtual void DisablePov()
         {
             currentCharaGo = null;
             POVEnabled = false;
-            GameCamera.fieldOfView = backupFOV;
-            GameCamera.nearClipPlane = backupNearClip;
-            if(GameCursor.IsInstance())
-                GameCursor.Instance.SetCursorLock(false);
+
+            if(GameCamera != null)
+            {
+                GameCamera.fieldOfView = backupFOV;
+                GameCamera.nearClipPlane = backupNearClip;
+
+                if(GameCursor.IsInstance())
+                    GameCursor.Instance.SetCursorLock(false);
+            }
         }
     }
 }