From 02105d57ddede0003ba364337165b446261a06f8 Mon Sep 17 00:00:00 2001
From: teejusb <5017202+teejusb@users.noreply.github.com>
Date: Fri, 22 Oct 2021 18:58:22 -0700
Subject: [PATCH] Revert "Always use PlayerState's own timing because of visual
 delay."

This reverts commit 8edca26493aa28bcca11103460350e20ed387b1b.
---
 src/PlayerState.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/PlayerState.cpp b/src/PlayerState.cpp
index 5cef47dedb..5ed8c66210 100644
--- a/src/PlayerState.cpp
+++ b/src/PlayerState.cpp
@@ -196,8 +196,9 @@ int PlayerState::GetSumOfActiveAttackLevels() const
 
 const SongPosition &PlayerState::GetDisplayedPosition() const
 {
-	// Player state should always use its own timing because of custom Visual Delay options.
-	return m_Position;
+	if( GAMESTATE->m_bIsUsingStepTiming )
+		return m_Position;
+	return GAMESTATE->m_Position;
 }
 
 const TimingData &PlayerState::GetDisplayedTiming() const