actually do what 0c976a2 was meant to

this alters the condition that ignores queued music if it's the same as the currently playing music, seeing as there's no way to access the params for playing without changing the currently playing music, waiting for the updates to finish setting properly, then changing the music back to what we originally wanted to play, and given that for whatever reason this breaks completely when using actual song timing, the condition now requires the songtiming for the queued musictoplay to be not null in order to ignore the playmusic request

Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/wifeTwirl.lua

@@ -114,14 +114,14 @@ local function toggleNoteField()
 	return end
 
 	if song then 
-		song:Borp()
 		if mcbootlarder:GetVisible() then
 			mcbootlarder:visible(false)
 			mcbootlarder:GetChild("NoteField"):visible(false)
 			MESSAGEMAN:Broadcast("ChartPreviewOff")
 		else
 			mcbootlarder:visible(true)
 			mcbootlarder:GetChild("NoteField"):visible(true)
+			song:Borp()
 			MESSAGEMAN:Broadcast("ChartPreviewOn")
 		end
 	end

src/GameSoundManager.cpp

@@ -104,7 +104,8 @@ StartMusic(MusicToPlay& ToPlay)
 {
 	LockMutex L(*g_Mutex);
 	if (g_Playing->m_Music->IsPlaying() &&
-		g_Playing->m_Music->GetLoadedFilePath().EqualsNoCase(ToPlay.m_sFile))
+		g_Playing->m_Music->GetLoadedFilePath().EqualsNoCase(ToPlay.m_sFile) &&
+		ToPlay.HasTiming)
 		return;
 
 	/* We're changing or stopping the music.  If we were dimming, reset. */

src/Song.cpp

@@ -2052,15 +2052,27 @@ void
 Song::Borp()
 {
 	GameSoundManager::PlayMusicParams PlayParams;
-	PlayParams.sFile = m_sMusicFile;
-	PlayParams.pTiming = &this->m_SongTiming;
+	PlayParams.sFile = GetMusicPath();
+	PlayParams.pTiming = nullptr;
 	PlayParams.bForceLoop = true;
 	PlayParams.fStartSecond = m_fMusicSampleStartSeconds;
-	PlayParams.fLengthSeconds = GetLastSecond() + 2.f;
+	PlayParams.fLengthSeconds = GetLastSecond() - m_fMusicSampleStartSeconds + 2.f;
 	PlayParams.fFadeOutLengthSeconds = 1.f;
 	PlayParams.bAlignBeat = true;
 	PlayParams.bApplyMusicRate = true;
-	SOUND->PlayMusic(PlayParams);
+
+	GameSoundManager::PlayMusicParams FallbackMusic;
+	FallbackMusic.sFile = GetMusicPath();
+	FallbackMusic.fFadeInLengthSeconds = 1.f;
+	FallbackMusic.bAlignBeat = true;
+
+	if (PlayParams.fLengthSeconds <
+		3.f) { // if the songpreview is after the last note
+		PlayParams.fStartSecond =
+		  5.f; // chartpreview wont play, just set it near the start -mina
+		PlayParams.fLengthSeconds = GetLastSecond() + 2.f;
+	}
+	SOUND->PlayMusic(PlayParams, FallbackMusic);
 }
 
 // lua start