Skip to content
Permalink
Browse files

Core: Save movie state before video backend state

Fixes the old frame number/inputs being displayed after loading state.
  • Loading branch information...
stenzek committed Jun 29, 2019
1 parent 560074c commit 63358adfb144f9a935a819358bc73e3769eaea8c
Showing with 5 additions and 2 deletions.
  1. +5 −2 Source/Core/Core/State.cpp
@@ -170,6 +170,11 @@ static void DoState(PointerWrap& p)
return;
}

// Movie must be done before the video backend, because the window is redrawn in the video backend
// state load, and the frame number must be up-to-date.
Movie::DoState(p);
p.DoMarker("Movie");

// Begin with video backend, so that it gets a chance to clear its caches and writeback modified
// things to RAM
g_video_backend->DoState(p);
@@ -186,8 +191,6 @@ static void DoState(PointerWrap& p)
if (SConfig::GetInstance().bWii)
Wiimote::DoState(p);
p.DoMarker("Wiimote");
Movie::DoState(p);
p.DoMarker("Movie");
Gecko::DoState(p);
p.DoMarker("Gecko");

0 comments on commit 63358ad

Please sign in to comment.
You can’t perform that action at this time.