From 34a19ef5832aa98c9edae98823faf2537f2abc59 Mon Sep 17 00:00:00 2001
From: AppleHair <eytanzury@gmail.com>
Date: Tue, 9 Jul 2024 19:59:31 +0300
Subject: [PATCH] [BUGFIX] Fixed `cancelMenu` sound not playing after switching
state.
---
source/funkin/ui/mainmenu/MainMenuState.hx | 2 +-
source/funkin/ui/options/OptionsState.hx | 2 +-
source/funkin/ui/story/StoryMenuState.hx | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/source/funkin/ui/mainmenu/MainMenuState.hx b/source/funkin/ui/mainmenu/MainMenuState.hx
index 1dcf57743..d219bfbcf 100644
--- a/source/funkin/ui/mainmenu/MainMenuState.hx
+++ b/source/funkin/ui/mainmenu/MainMenuState.hx
@@ -412,8 +412,8 @@ class MainMenuState extends MusicBeatState
if (controls.BACK && menuItems.enabled && !menuItems.busy)
{
- FunkinSound.playOnce(Paths.sound('cancelMenu'));
FlxG.switchState(() -> new TitleState());
+ FunkinSound.playOnce(Paths.sound('cancelMenu'));
}
}
}
diff --git a/source/funkin/ui/options/OptionsState.hx b/source/funkin/ui/options/OptionsState.hx
index 40308d96b..a2301e6a3 100644
--- a/source/funkin/ui/options/OptionsState.hx
+++ b/source/funkin/ui/options/OptionsState.hx
@@ -145,8 +145,8 @@ class Page extends FlxGroup
{
if (canExit && controls.BACK)
{
- FunkinSound.playOnce(Paths.sound('cancelMenu'));
exit();
+ FunkinSound.playOnce(Paths.sound('cancelMenu'));
}
}
diff --git a/source/funkin/ui/story/StoryMenuState.hx b/source/funkin/ui/story/StoryMenuState.hx
index 4da467db7..4e51fb229 100644
--- a/source/funkin/ui/story/StoryMenuState.hx
+++ b/source/funkin/ui/story/StoryMenuState.hx
@@ -390,9 +390,9 @@ class StoryMenuState extends MusicBeatState
if (controls.BACK && !exitingMenu && !selectedLevel)
{
- FunkinSound.playOnce(Paths.sound('cancelMenu'));
exitingMenu = true;
FlxG.switchState(() -> new MainMenuState());
+ FunkinSound.playOnce(Paths.sound('cancelMenu'));
}
}