Update PauseSubState.hx

ShadowMario · Dec 26, 2023 · c6daeb8 · c6daeb8
1 parent a1d9aee
commit c6daeb8
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/source/substates/PauseSubState.hx b/source/substates/PauseSubState.hx
@@ -30,7 +30,7 @@ class PauseSubState extends MusicBeatSubstate
 	var missingTextBG:FlxSprite;
 	var missingText:FlxText;
 
-	public static var songName:String = '';
+	public static var songName:String = null;
 
 	public function new(x:Float, y:Float)
 	{
@@ -61,11 +61,19 @@ class PauseSubState extends MusicBeatSubstate
 
 
 		pauseMusic = new FlxSound();
-		if(songName != null) {
-			pauseMusic.loadEmbedded(Paths.music(songName), true, true);
-		} else if (songName != 'None') {
-			pauseMusic.loadEmbedded(Paths.music(Paths.formatToSongPath(ClientPrefs.data.pauseMusic)), true, true);
-		}
+		try
+		{
+			if (songName == null || songName.toLowerCase() != 'none')
+			{
+				if(songName == null)
+				{
+					var path:String = Paths.formatToSongPath(ClientPrefs.data.pauseMusic);
+					if(path.toLowerCase() != 'none')
+						pauseMusic.loadEmbedded(Paths.music(Paths.formatToSongPath(ClientPrefs.data.pauseMusic)), true, true);
+				}
+				else pauseMusic.loadEmbedded(Paths.music(songName), true, true);
+			}
+		} catch(e:Dynamic) {}
 		pauseMusic.volume = 0;
 		pauseMusic.play(false, FlxG.random.int(0, Std.int(pauseMusic.length / 2)));