From 581fd2b1e3af77ebd62471e749afb16b50942be2 Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Sat, 16 Jul 2022 23:16:35 -0700
Subject: [PATCH] Fix SYSCONF movie settings

The movie config layer is not active for recording, only playback. Thus, recording ends up stuck with default SYSCONF settings.
The fix is simply to add in the movie config layer when recording. The way it's done is a bit hacky, but seems to work.
---
 Source/Core/Core/Movie.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp
index f988fc7e65..7f8653eed9 100644
--- a/Source/Core/Core/Movie.cpp
+++ b/Source/Core/Core/Movie.cpp
@@ -600,6 +600,15 @@ bool BeginRecordingInput(const ControllerTypeArray& controllers,
 
     s_currentByte = 0;
 
+    // This is a bit of a hack, SYSCONF movie code expects the movie layer active for both recording
+    // and playback. That layer is really only designed for playback, not recording. Also, we can't
+    // know if we're using a Wii at this point. So, we'll assume a Wii is used here. In practice,
+    // this shouldn't affect anything for GC (as its only unique setting is language, which will be
+    // taken from base settings as expected)
+    static DTMHeader header = {.bWii = true};
+    ConfigLoaders::SaveToDTM(&header);
+    Config::AddLayer(ConfigLoaders::GenerateMovieConfigLoader(&header));
+
     if (Core::IsRunning())
       Core::UpdateWantDeterminism();
   });
@@ -1349,6 +1358,7 @@ void EndPlayInput(bool cont)
     s_playMode = PlayMode::None;
     Core::DisplayMessage("Movie End.", 2000);
     s_bRecordingFromSaveState = false;
+    Config::RemoveLayer(Config::LayerType::Movie);
     // we don't clear these things because otherwise we can't resume playback if we load a movie
     // state later
     // s_totalFrames = s_totalBytes = 0;