Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-29 09:05:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Frontend: Fix invalid FPS showing when reset

Browse source
This commit is contained in:
Connor McLaughlin 2019-10-05 14:50:23 +10:00
parent ae260b924c
commit e80775ed82
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/duckstation/sdl_interface.cpp
View file

@ -489,7 +489,7 @@ void SDLInterface::DrawMainMenuBar()
if (ImGui::BeginMenu("System")) if (ImGui::BeginMenu("System"))
{ {
if (ImGui::MenuItem("Reset")) if (ImGui::MenuItem("Reset"))
m_system->Reset(); DoReset();
ImGui::Separator(); ImGui::Separator();
@ -654,6 +654,16 @@ void SDLInterface::DrawOSDMessages()
} }
} }
void SDLInterface::DoReset()
{
m_system->Reset();
m_last_frame_number = 0;
m_last_internal_frame_number = 0;
m_last_global_tick_counter = 0;
m_fps_timer.Reset();
AddOSDMessage("System reset.");
}
void SDLInterface::DoLoadState(u32 index) void SDLInterface::DoLoadState(u32 index)
{ {
LoadState(GetSaveStateFilename(index)); LoadState(GetSaveStateFilename(index));

1
src/duckstation/sdl_interface.h
View file

@ -51,6 +51,7 @@ private:
// We only pass mouse input through if it's grabbed // We only pass mouse input through if it's grabbed
bool IsWindowFullscreen() const; bool IsWindowFullscreen() const;
void DrawImGui(); void DrawImGui();
void DoReset();
void DoLoadState(u32 index); void DoLoadState(u32 index);
void DoSaveState(u32 index); void DoSaveState(u32 index);