From 395bf1cb5bb46c2a306903be70ba77c4a40691bd Mon Sep 17 00:00:00 2001
From: Lncvrt <lncvrtreal@gmail.com>
Date: Thu, 5 Jun 2025 13:41:16 -0700
Subject: [PATCH] Fully async scene management

---
 Assets/Scripts/AccountMenu.cs         | 2 +-
 Assets/Scripts/ButtonToScene.cs       | 4 ++--
 Assets/Scripts/GamePlayerPauseMenu.cs | 4 ++--
 Assets/Scripts/IconsMenu.cs           | 4 ++--
 Assets/Scripts/LeaderboardsMenu.cs    | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Assets/Scripts/AccountMenu.cs b/Assets/Scripts/AccountMenu.cs
index f0272a6..42933a3 100644
--- a/Assets/Scripts/AccountMenu.cs
+++ b/Assets/Scripts/AccountMenu.cs
@@ -73,7 +73,7 @@ public class AccountMenu : MonoBehaviour
         loggedInSaveButton.onClick.AddListener(() => SaveAccount());
         loggedInLoadButton.onClick.AddListener(() => LoadAccount());
         loggedInLogoutButton.onClick.AddListener(() => SwitchPanel(1));
-        loggedInBackButton.onClick.AddListener(() => SceneManager.LoadSceneAsync("MainMenu"));
+        loggedInBackButton.onClick.AddListener(async () => await SceneManager.LoadSceneAsync("MainMenu"));
         loggedOutLoginButton.onClick.AddListener(() => SwitchPanel(2));
         loggedOutRegisterButton.onClick.AddListener(() => SwitchPanel(3));
         loggedOutBackButton.onClick = loggedInBackButton.onClick;
diff --git a/Assets/Scripts/ButtonToScene.cs b/Assets/Scripts/ButtonToScene.cs
index 26121df..a85b761 100644
--- a/Assets/Scripts/ButtonToScene.cs
+++ b/Assets/Scripts/ButtonToScene.cs
@@ -8,8 +8,8 @@ public class ButtonToScene : MonoBehaviour
 
     void Awake()
     {
-        gameObject.GetComponent<Button>().onClick.AddListener(() => {
-            SceneManager.LoadSceneAsync(sceneName);
+        gameObject.GetComponent<Button>().onClick.AddListener(async () => {
+            await SceneManager.LoadSceneAsync(sceneName);
         });
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/GamePlayerPauseMenu.cs b/Assets/Scripts/GamePlayerPauseMenu.cs
index d28e361..0b9ae7f 100644
--- a/Assets/Scripts/GamePlayerPauseMenu.cs
+++ b/Assets/Scripts/GamePlayerPauseMenu.cs
@@ -13,9 +13,9 @@ public class GamePlayerPauseMenu : MonoBehaviour
     {
         musicSlider.value = PlayerPrefs.GetFloat("musicVolume", 1f);
         sfxSlider.value = PlayerPrefs.GetFloat("sfxVolume", 1f);
-        backButton.onClick.AddListener(() =>
+        backButton.onClick.AddListener(async () =>
         {
-            UnityEngine.SceneManagement.SceneManager.LoadSceneAsync("MainMenu");
+            await UnityEngine.SceneManagement.SceneManager.LoadSceneAsync("MainMenu");
         });
         continueButton.onClick.AddListener(GamePlayer.instance.DisablePause);
         musicSlider.onValueChanged.AddListener(value =>
diff --git a/Assets/Scripts/IconsMenu.cs b/Assets/Scripts/IconsMenu.cs
index 6f11246..ba28fe4 100644
--- a/Assets/Scripts/IconsMenu.cs
+++ b/Assets/Scripts/IconsMenu.cs
@@ -51,12 +51,12 @@ public class Iconsmenu : MonoBehaviour
             placeholderButton.interactable = false;
         }
         placeholderButton.onClick.AddListener(ToggleKit);
-        backButton.onClick.AddListener(() =>
+        backButton.onClick.AddListener(async () =>
         {
             PlayerPrefs.SetInt("icon", Mathf.Clamp(PlayerPrefs.GetInt("icon", 0), 1, 8));
             PlayerPrefs.SetInt("overlay", Mathf.Clamp(PlayerPrefs.GetInt("overlay", 0), 0, 14));
             PlayerPrefs.Save();
-            SceneManager.LoadSceneAsync("MainMenu");
+            await SceneManager.LoadSceneAsync("MainMenu");
         });
         previewBird.GetComponentInParent<Button>().onClick.AddListener(() =>
         {
diff --git a/Assets/Scripts/LeaderboardsMenu.cs b/Assets/Scripts/LeaderboardsMenu.cs
index 8acc074..3d40e2f 100644
--- a/Assets/Scripts/LeaderboardsMenu.cs
+++ b/Assets/Scripts/LeaderboardsMenu.cs
@@ -22,9 +22,9 @@ public class LeaderboardsMenu : MonoBehaviour
         {
             GetTopPlayers(value);
         });
-        backButton.onClick.AddListener(() =>
+        backButton.onClick.AddListener(async () =>
         {
-            SceneManager.LoadScene("MainMenu");
+            await SceneManager.LoadSceneAsync("MainMenu");
         });
         refreshButton.onClick.AddListener(() =>
         {