a victorian child would die from seeing this

Author: RayDeeUx

src/FMODAudioEngine.cpp

@@ -11,15 +11,15 @@ float stupidAccmulatorTooLazyToPutElsewhere = 0;
 class $modify(MenuLoopFMODHook, FMODAudioEngine) {
 	void update(float dt) {
 		FMODAudioEngine::update(dt);
-		if (GJBaseGameLayer::get() || VANILLA_GD_MENU_LOOP_DISABLED) {
+		SongManager& songManager = SongManager::get();
+		if (songManager.getComingFromGJBGL() || GJBaseGameLayer::get() || VANILLA_GD_MENU_LOOP_DISABLED) {
 			if (stupidAccmulatorTooLazyToPutElsewhere != 0) stupidAccmulatorTooLazyToPutElsewhere = 0;
 			return;
 		}
 
 		if (SongManager::get().getAdvancedLogs()) stupidAccmulatorTooLazyToPutElsewhere += dt;
 		else if (stupidAccmulatorTooLazyToPutElsewhere != 0) stupidAccmulatorTooLazyToPutElsewhere = 0;
 
-		SongManager& songManager = SongManager::get();
 		constexpr int channelNumber = 0;
 
 		FMOD::Channel* menuLoopChannelProbably = FMODAudioEngine::get()->getActiveMusicChannel(channelNumber);
@@ -37,7 +37,7 @@ class $modify(MenuLoopFMODHook, FMODAudioEngine) {
 
 		unsigned int position = 0;
 		menuLoopChannelProbably->getPosition(&position, FMOD_TIMEUNIT_MS);
-		if (position > songManager.getLastMenuLoopPosition() && !songManager.getComingFromGJBGL()) songManager.setLastMenuLoopPosition(position); // so the problem with trying to move this logic to GJBGL::init() is that by the time GJBGL::init() is called, FMOD's menu loop track has already been stopped and its position resets to 0. hence why we are here instead.
+		if (position > songManager.getLastMenuLoopPosition()) songManager.setLastMenuLoopPosition(position); // so the problem with trying to move this logic to GJBGL::init() is that by the time GJBGL::init() is called, FMOD's menu loop track has already been stopped and its position resets to 0. hence why we are here instead.
 
 		if (!songManager.getConstantShuffleMode() || songManager.isOverride()) return;
 		if (GJBaseGameLayer::get() || songManager.isOriginalMenuLoop() || songManager.getSongsSize() < 2) return;

src/ui/SongControlMenu.cpp

@@ -353,7 +353,6 @@ void SongControlMenu::onSkipBkwdButton(CCObject*) {
 	const std::string& currSong = songManager.getCurrentSong();
 	if (fmod->getActiveMusic(0) != currSong || !songManager.getSongToSongDataEntries().contains(currSong)) return;
 
-	songManager.setComingFromGJBGL(true);
 	const int fullLength = songManager.getSongToSongDataEntries().find(songManager.getCurrentSong())->second.songLength;
 	const int lastPosition = songManager.getLastMenuLoopPosition();
 
@@ -366,7 +365,6 @@ void SongControlMenu::onSkipBkwdButton(CCObject*) {
 	} else {
 		fmod->getActiveMusicChannel(0)->setPosition(lastPosition - 5000, FMOD_TIMEUNIT_MS);
 	}
-	songManager.setComingFromGJBGL(false);
 }
 
 void SongControlMenu::onSkipFwrdButton(CCObject*) {
@@ -380,7 +378,6 @@ void SongControlMenu::onSkipFwrdButton(CCObject*) {
 	const int fullLength = songManager.getSongToSongDataEntries().find(songManager.getCurrentSong())->second.songLength;
 	const int lastPosition = songManager.getLastMenuLoopPosition();
 
-	songManager.setComingFromGJBGL(true);
 	if ((lastPosition + 5000) > fullLength) {
 		if (songManager.getConstantShuffleMode()) {
 			SongControl::shuffleSong();
@@ -391,7 +388,6 @@ void SongControlMenu::onSkipFwrdButton(CCObject*) {
 	} else {
 		fmod->getActiveMusicChannel(0)->setPosition(lastPosition + 5000, FMOD_TIMEUNIT_MS);
 	}
-	songManager.setComingFromGJBGL(false);
 }
 
 void SongControlMenu::updateCurrentLabel() {