Fix a bug triggered by changing scenes and then later exiting map mode

JonnyOThan · JonnyOThan · commit c6ec30310b6d · 2023-02-13T19:59:25.000-05:00
diff --git a/ProbeControlRoom/ProbeControlRoom.cs b/ProbeControlRoom/ProbeControlRoom.cs
@@ -240,7 +240,10 @@ private void toggleIVA()
         /// </summary>
         public void OnDestroy()
         {
-            stopIVA();
+            if (isActive)
+            {
+                stopIVA();
+            }
 
             ProbeControlRoomUtils.Logger.debug("OnDestroy()");
 
@@ -555,7 +558,7 @@ public void stopIVA()
             InputLockManager.RemoveControlLock("ProbeControlRoom");
 
             //Switch back to normal cameras
-            if (CameraManager.Instance.currentCameraMode == CameraManager.CameraMode.IVA)
+            if (CameraManager.Instance != null && CameraManager.Instance.currentCameraMode == CameraManager.CameraMode.IVA)
             {
                 CameraManager.Instance.SetCameraFlight();
             }

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,10 @@ private void toggleIVA()`
`240`	`240`	`/// </summary>`
`241`	`241`	`public void OnDestroy()`
`242`	`242`	`{`
`243`		`- stopIVA();`
	`243`	`+ if (isActive)`
	`244`	`+ {`
	`245`	`+ stopIVA();`
	`246`	`+ }`
`244`	`247`
`245`	`248`	`ProbeControlRoomUtils.Logger.debug("OnDestroy()");`
`246`	`249`
`@@ -555,7 +558,7 @@ public void stopIVA()`
`555`	`558`	`InputLockManager.RemoveControlLock("ProbeControlRoom");`
`556`	`559`
`557`	`560`	`//Switch back to normal cameras`
`558`		`- if (CameraManager.Instance.currentCameraMode == CameraManager.CameraMode.IVA)`
	`561`	`+ if (CameraManager.Instance != null && CameraManager.Instance.currentCameraMode == CameraManager.CameraMode.IVA)`
`559`	`562`	`{`
`560`	`563`	`CameraManager.Instance.SetCameraFlight();`
`561`	`564`	`}`