E

Fixed a funny bug where you could crash any editor by opening an editor and immediately exiting before the editor song starts The note offset state now changes to the correct menu music when you exit
JordanSantiagoYT · Feb 25, 2024 · f6dafff · f6dafff
1 parent 24bd57f
commit f6dafff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/source/editors/EditingMusic.hx b/source/editors/EditingMusic.hx
@@ -44,7 +44,8 @@ class EditingMusic
 	    }
         public function destroy()
         {
-            music.destroy();
+		if (startTimer != null) startTimer.cancel();
+            if (music != null) music.destroy();
             reset();
         }
         public function playMusic(time:Float = 0)

diff --git a/source/options/NoteOffsetState.hx b/source/options/NoteOffsetState.hx
@@ -356,7 +356,7 @@ class NoteOffsetState extends MusicBeatState
 			persistentUpdate = false;
 			CustomFadeTransition.nextCamera = camOther;
 			FlxG.switchState(options.OptionsState.new);
-			FlxG.sound.playMusic(Paths.music('freakyMenu'), 1, true);
+			FlxG.sound.playMusic(Paths.music('freakyMenu-' + ClientPrefs.daMenuMusic), 1, true);
 			FlxG.mouse.visible = false;
 		}