From 4f154bce3c9fb9138907631e59901c5e53469c4c Mon Sep 17 00:00:00 2001 From: R2DLiu Date: Tue, 14 Jul 2020 23:51:11 -0400 Subject: [PATCH] fix bug, working seek bar --- Source/Core/Core/Slippi/SlippiPlayback.cpp | 3 ++- Source/Core/VideoCommon/OnScreenDisplay.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Slippi/SlippiPlayback.cpp b/Source/Core/Core/Slippi/SlippiPlayback.cpp index 7d08a5dfbf..4b40f4e3d3 100644 --- a/Source/Core/Core/Slippi/SlippiPlayback.cpp +++ b/Source/Core/Core/Slippi/SlippiPlayback.cpp @@ -227,11 +227,12 @@ void SlippiPlaybackStatus::SeekToFrame() Core::SetState(Core::State::Paused); SConfig::GetInstance().m_OCFactor = 1.0f; SConfig::GetInstance().m_OCEnable = false; - targetFrameNum = INT_MAX; isHardFFW = false; } + targetFrameNum = INT_MAX; Core::SetState(prevState); + seekMtx.unlock(); } else { INFO_LOG(SLIPPI, "Already seeking. Ignoring this call"); } diff --git a/Source/Core/VideoCommon/OnScreenDisplay.cpp b/Source/Core/VideoCommon/OnScreenDisplay.cpp index 22250c4f0b..a5ed4d8980 100644 --- a/Source/Core/VideoCommon/OnScreenDisplay.cpp +++ b/Source/Core/VideoCommon/OnScreenDisplay.cpp @@ -422,7 +422,7 @@ void DrawSlippiPlaybackControls() } ImGui::SetCursorPos(ImVec2(0.0f, ImGui::GetWindowHeight() - 30)); ImGui::PushStyleVar(ImGuiStyleVar_ButtonTextAlign, ImVec2(1.0f, 0.5f)); - if (ButtonCustom(ICON_FA_PLAY, ImVec2(32.0f, 32.0f))) { + if (ButtonCustom(ICON_FA_PAUSE, ImVec2(32.0f, 32.0f))) { INFO_LOG(SLIPPI, "playing"); } ImGui::PopStyleVar();