Fixed stuck in menu if trying to change setting

Raicuparta · Aug 20, 2020 · 7d01dbb · 7d01dbb
1 parent 89a1334
commit 7d01dbb
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/NomaiVR/UI/Menus.cs b/NomaiVR/UI/Menus.cs
@@ -15,13 +15,13 @@ public class Behaviour : MonoBehaviour
             private static bool _shouldRenderStarLogos;
             private static readonly List<Canvas> patchedCanvases = new List<Canvas>();
             private static readonly string[] _ignoredCanvases = { "LoadManagerFadeCanvas", "PauseBackdropCanvas" };
+            private readonly List<GameObject> _canvasObjectsToHide = new List<GameObject>();
             private Camera _flashbackCamera;
             private Transform _flashbackCameraParent;
-            private GameObject _canvasParent;
+            private bool _isCanvasObjectsActive;
 
             internal void Start()
             {
-                SetUpCanvasParent();
                 if (SceneHelper.IsInGame())
                 {
                     SetUpFlashbackCameraParent();
@@ -43,26 +43,32 @@ internal void Start()
 
             internal void Update()
             {
-                if (_canvasParent.activeSelf && !IsMenuInteractionAllowed())
+                UpdateCanvasObjectsActive();
+            }
+
+            private void UpdateCanvasObjectsActive()
+            {
+                if (_isCanvasObjectsActive && !IsMenuInteractionAllowed())
                 {
-                    _canvasParent.SetActive(false);
+                    SetCanvasObjectsActive(false);
                     return;
                 }
-                if (!_canvasParent.activeSelf && IsMenuInteractionAllowed())
+                if (!_isCanvasObjectsActive && IsMenuInteractionAllowed())
                 {
-                    _canvasParent.SetActive(true);
+                    SetCanvasObjectsActive(true);
                     return;
                 }
             }
 
-            private bool IsMenuInteractionAllowed()
+            private void SetCanvasObjectsActive(bool active)
             {
-                return OWTime.IsPaused() || !SceneHelper.IsInGame() || PlayerState.IsSleepingAtCampfire();
+                _canvasObjectsToHide.ForEach(canvasObject => canvasObject.SetActive(active));
+                _isCanvasObjectsActive = active;
             }
 
-            private void SetUpCanvasParent()
+            private bool IsMenuInteractionAllowed()
             {
-                _canvasParent = new GameObject();
+                return OWTime.IsPaused() || !SceneHelper.IsInGame() || PlayerState.IsSleepingAtCampfire();
             }
 
             private void SetUpFlashbackCameraParent()
@@ -125,7 +131,7 @@ private static void FixTitleMenuCanvases()
 
             private void AddFollowTarget(Canvas canvas)
             {
-                canvas.transform.parent = _canvasParent.transform;
+                _canvasObjectsToHide.Add(canvas.gameObject);
                 var followTarget = canvas.gameObject.AddComponent<FollowTarget>();
                 if (SceneHelper.IsInGame())
                 {