fix settings not persisting correctly in replay gameplay

jameskr97 · Dec 19, 2022 · 0785900 · 0785900
1 parent 39e9093
commit 0785900
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/Etterna/Screen/Gameplay/ScreenGameplayReplay.cpp b/src/Etterna/Screen/Gameplay/ScreenGameplayReplay.cpp
@@ -209,9 +209,8 @@ ScreenGameplayReplay::~ScreenGameplayReplay()
 		GAMESTATE->m_SongOptions.GetCurrent().m_fMusicRate = settings.oldRate;
 		GAMESTATE->m_SongOptions.GetSong().m_fMusicRate = settings.oldRate;
 		GAMESTATE->m_SongOptions.GetStage().m_fMusicRate = settings.oldRate;
-	} else {
-		REPLAYS->InitReplayPlaybackForScore(REPLAYS->GetActiveReplayScore(),
-											Player::GetTimingWindowScale());
+
+		REPLAYS->ResetActiveReplaySettings();
 	}
 }
 

diff --git a/src/Etterna/Screen/Others/ScreenSelectMusic.cpp b/src/Etterna/Screen/Others/ScreenSelectMusic.cpp
@@ -1785,6 +1785,7 @@ class LunaScreenSelectMusic : public Luna<ScreenSelectMusic>
 		auto usesMirror = potmp.m_bTurns[PlayerOptions::TURN_MIRROR];
 		auto replayRng = hs->GetStageSeed();
 		auto hsMods = hs->GetModifiers();
+		REPLAYS->ResetActiveReplaySettings();
 		REPLAYS->StoreActiveReplaySettings(scoreRate,
 										   hsMods,
 										   usesMirror,

diff --git a/src/Etterna/Singletons/ReplayManager.cpp b/src/Etterna/Singletons/ReplayManager.cpp
@@ -120,7 +120,6 @@ ReplayManager::InitReplayPlaybackForScore(HighScore* hs,
 
 	activeReplayScore = hs;
 	activeReplay = GetReplay(hs);
-	activeReplaySettings.reset();
 
 	activeReplay->GenerateJudgeInfoAndReplaySnapshots(startRow, timingScale);
 
@@ -135,7 +134,6 @@ ReplayManager::UnsetActiveReplay()
 	}
 	activeReplayScore = nullptr;
 	activeReplay = GetReplay(nullptr);
-	activeReplaySettings.reset();
 }
 
 Replay*
@@ -185,6 +183,12 @@ ReplayManager::GetActiveReplaySettings()
 	return activeReplaySettings;
 }
 
+void
+ReplayManager::ResetActiveReplaySettings()
+{
+	activeReplaySettings.reset();
+}
+
 auto
 ReplayManager::CalculateRadarValuesForReplay(Replay& replay, RadarValues& rv, RadarValues& possibleRV)
   -> bool

diff --git a/src/Etterna/Singletons/ReplayManager.h b/src/Etterna/Singletons/ReplayManager.h
@@ -75,6 +75,7 @@ class ReplayManager
 						  int oldRngSeed);
 
 	TemporaryReplaySettings GetActiveReplaySettings();
+	void ResetActiveReplaySettings();
 
 	static TapNoteScore GetTapNoteScoreForReplay(float fNoteOffset,
 												 float timingScale = 1.F);