add transient setting for hiding seekbar via cli

project-slippi · May 25, 2021 · bae5f24 · bae5f24
1 parent a07c3da
commit bae5f24
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h
@@ -315,6 +315,8 @@ struct SConfig : NonCopyable
 	bool m_InterfaceToolbar;
 	bool m_InterfaceStatusbar;
 	bool m_InterfaceSeekbar;
+	// a transient setting for when a program hides the seekbar via the command line
+	bool m_CLIHideSeekbar = false;
 	bool m_InterfaceLogWindow;
 	bool m_InterfaceLogConfigWindow;
 	bool m_InterfaceExtendedFPSInfo;

diff --git a/Source/Core/Core/Slippi/SlippiPlayback.cpp b/Source/Core/Core/Slippi/SlippiPlayback.cpp
@@ -174,7 +174,8 @@ void SlippiPlaybackStatus::SavestateThread()
 			processInitialState(iState);
 			inSlippiPlayback = true;
 		}
-		else if (SConfig::GetInstance().m_InterfaceSeekbar && !hasStateBeenProcessed && !isStartFrame)
+		else if (SConfig::GetInstance().m_InterfaceSeekbar && !SConfig::GetInstance().m_CLIHideSeekbar &&
+		         !hasStateBeenProcessed && !isStartFrame)
 		{
 			INFO_LOG(SLIPPI, "saving diff at frame: %d", fixedFrameNumber);
 			State::SaveToBuffer(cState);

diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
@@ -1624,7 +1624,8 @@ void CFrame::ParseHotkeys()
 	// Slippi replay hotkeys and setup
 	if (IsHotkey(HK_HIDE_SEEKBAR))
 		SConfig::GetInstance().m_InterfaceSeekbar = !SConfig::GetInstance().m_InterfaceSeekbar;
-	if (SConfig::GetInstance().m_InterfaceSeekbar && g_playbackStatus && g_playbackStatus->inSlippiPlayback)
+	if (SConfig::GetInstance().m_InterfaceSeekbar && !SConfig::GetInstance().m_CLIHideSeekbar && g_playbackStatus &&
+	    g_playbackStatus->inSlippiPlayback)
 	{		
 		if (IsHotkey(HK_JUMP_BACK))
 			g_playbackStatus->shouldJumpBack = true;

diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp
@@ -144,10 +144,7 @@ bool DolphinApp::OnInit()
 		SConfig::GetInstance().m_strSlippiInput = "Slippi/playback.txt";
 
 	if (m_hide_seekbar) // Hide seekbar if necessary by cmd line (mostly for external recording applications)
-	{
-		m_prev_seekbar = SConfig::GetInstance().m_InterfaceSeekbar;
-		SConfig::GetInstance().m_InterfaceSeekbar = false;
-	}
+		SConfig::GetInstance().m_CLIHideSeekbar = true;
 
 	if (m_enable_cout) // Enable cout if necessary by cmd line (mostly for external recording applications)
 		SConfig::GetInstance().m_coutEnabled = true;
@@ -554,10 +551,6 @@ void DolphinApp::OnEndSession(wxCloseEvent &event)
 
 int DolphinApp::OnExit()
 {
-	if (m_hide_seekbar) // retain the seekbar setting from before cmd line switch
-	{
-		SConfig::GetInstance().m_InterfaceSeekbar = m_prev_seekbar;
-	}
 	Core::Shutdown();
 	UICommon::Shutdown();