fix: Fix the instrumental selector still allowing inputs after a song…

… is selected
FunkinCrew · Feb 18, 2025 · 0e0c4ae · 0e0c4ae
1 parent 3492d41
commit 0e0c4ae
Showing 1 changed file with 27 additions and 20 deletions.
diff --git a/source/funkin/ui/freeplay/CapsuleOptionsMenu.hx b/source/funkin/ui/freeplay/CapsuleOptionsMenu.hx
@@ -22,6 +22,8 @@ class CapsuleOptionsMenu extends FlxSpriteGroup
 
   var currentInstrumental:FlxText;
 
+  var busy:Bool = false;
+
   public function new(parent:FreeplayState, x:Float = 0, y:Float = 0, instIds:Array<String>):Void
   {
     super(x, y);
@@ -66,36 +68,41 @@ class CapsuleOptionsMenu extends FlxSpriteGroup
       destroy();
       return;
     }
-    @:privateAccess
-    if (parent.controls.BACK)
-    {
-      close();
-      return;
-    }
-
     var changedInst = false;
-    if (parent.getControls().UI_LEFT_P)
-    {
-      currentInstrumentalIndex = (currentInstrumentalIndex + 1) % instrumentalIds.length;
-      changedInst = true;
-    }
-    if (parent.getControls().UI_RIGHT_P)
+
+    if (!busy)
     {
-      currentInstrumentalIndex = (currentInstrumentalIndex - 1 + instrumentalIds.length) % instrumentalIds.length;
-      changedInst = true;
+      @:privateAccess
+      if (parent.controls.BACK)
+      {
+        close();
+        return;
+      }
+
+      if (parent.getControls().UI_LEFT_P)
+      {
+        currentInstrumentalIndex = (currentInstrumentalIndex + 1) % instrumentalIds.length;
+        changedInst = true;
+      }
+      if (parent.getControls().UI_RIGHT_P)
+      {
+        currentInstrumentalIndex = (currentInstrumentalIndex - 1 + instrumentalIds.length) % instrumentalIds.length;
+        changedInst = true;
+      }
+      if (parent.getControls().ACCEPT)
+      {
+        busy = true;
+        onConfirm(instrumentalIds[currentInstrumentalIndex] ?? '');
+      }
     }
+
     if (!changedInst && currentInstrumental.text == '') changedInst = true;
 
     if (changedInst)
     {
       currentInstrumental.text = instrumentalIds[currentInstrumentalIndex].toTitleCase() ?? '';
       if (currentInstrumental.text == '') currentInstrumental.text = 'Default';
     }
-
-    if (parent.getControls().ACCEPT)
-    {
-      onConfirm(instrumentalIds[currentInstrumentalIndex] ?? '');
-    }
   }
 
   public function close():Void