dont run OnEnable until injected

fixes #5
Aeroluna · Jan 28, 2025 · 51aa925 · 51aa925
1 parent 477dd3c
commit 51aa925
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/Vivify/Controllers/CameraPropertyController.cs b/Vivify/Controllers/CameraPropertyController.cs
@@ -14,6 +14,8 @@ namespace Vivify.Controllers;
 [RequireComponent(typeof(Camera))]
 internal class CameraPropertyController : MonoBehaviour
 {
+    private bool _injected;
+
     private Camera _camera = null!;
     private DepthTextureMode _cachedDepthTextureMode;
     private CameraClearFlags _cachedClearFlags;
@@ -115,6 +117,11 @@ private void Construct(
         SettingsManager settingsManager)
     {
         _settingsManager = settingsManager;
+        _injected = true;
+        if (isActiveAndEnabled)
+        {
+            OnEnable();
+        }
     }
 #endif
 
@@ -132,6 +139,11 @@ private void Awake()
 
     private void OnEnable()
     {
+        if (!_injected)
+        {
+            return;
+        }
+
         _cachedDepthTextureMode = _camera.depthTextureMode;
         _cachedClearFlags = _camera.clearFlags;
         _cachedBackgroundColor = _camera.backgroundColor;