Fixed modal duplication

Sirspam · Dec 2, 2021 · cb7f6de · cb7f6de
1 parent ae29e2c
commit cb7f6de
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/Nya/UI/ViewControllers/NSFWConfirmModalController.cs b/Nya/UI/ViewControllers/NSFWConfirmModalController.cs
@@ -45,12 +45,11 @@ private void noNSFW()
 
         private void Parse(Transform parentTransform)
         {
-            BSMLParser.instance.Parse(BeatSaberMarkupLanguage.Utilities.GetResourceContent(Assembly.GetExecutingAssembly(), "Nya.UI.Views.NSFWConfirmModal.bsml"), parentTransform.gameObject, this);
-            modalView.SetField("_animateParentCanvas", false);
-            if (rootTransform != null && modalTransform != null)
+            if (!modalView)
             {
-                modalTransform.SetParent(rootTransform);
-                modalTransform.gameObject.SetActive(false);
+                BSMLParser.instance.Parse(BeatSaberMarkupLanguage.Utilities.GetResourceContent(Assembly.GetExecutingAssembly(), "Nya.UI.Views.NSFWConfirmModal.bsml"), parentTransform.gameObject, this);
+                modalView.SetField("_animateParentCanvas", false);
+                modalView.name = "NyaNSFWConfirmaModal";
             }
         }
 

diff --git a/Nya/UI/ViewControllers/SettingsModalController.cs b/Nya/UI/ViewControllers/SettingsModalController.cs
@@ -61,12 +61,11 @@ private bool nsfwCheck
 
         private void Parse(Transform parentTransform)
         {
-            BSMLParser.instance.Parse(Utilities.GetResourceContent(Assembly.GetExecutingAssembly(), "Nya.UI.Views.SettingsModal.bsml"), parentTransform.gameObject, this);
-            FieldAccessor<ModalView, bool>.Set(ref modalView, "_animateParentCanvas", true);
-            if (rootTransform != null && modalTransform != null)
+            if (!modalView)
             {
-                modalTransform.SetParent(rootTransform);
-                modalTransform.gameObject.SetActive(false);
+                BSMLParser.instance.Parse(Utilities.GetResourceContent(Assembly.GetExecutingAssembly(), "Nya.UI.Views.SettingsModal.bsml"), parentTransform.gameObject, this);
+                FieldAccessor<ModalView, bool>.Set(ref modalView, "_animateParentCanvas", true);
+                modalView.name = "NyaSettingsModal";
             }
         }