summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorScott Mansell <phiren@gmail.com>2021-09-30 15:34:10 +1300
committerGitHub <noreply@github.com>2021-09-30 15:34:10 +1300
commit40d9694bd047e99ecd68c9e6c77ab7fbeabe753a (patch)
tree59a6c8a0a3f4bce2163fec3b002b45053c4fc6a0 /Source/Core
parenta7224b299c609a5d5ee803610f1fbedea5fb0a30 (diff)
parentfaa5cf40cebc8aab1eca525a69ce77ad6d2cf87d (diff)
Merge pull request #10139 from malleoz/movie-mismatch-fix
Movie: display correct input difference on movie mismatch
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/Movie.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp
index 31e8ca3b43..f2b29fb969 100644
--- a/Source/Core/Core/Movie.cpp
+++ b/Source/Core/Core/Movie.cpp
@@ -1072,8 +1072,7 @@ void LoadInput(const std::string& movie_path)
memcpy(&curPadState, &s_temp_input[frame * sizeof(ControllerState)],
sizeof(ControllerState));
ControllerState movPadState;
- memcpy(&movPadState, &s_temp_input[frame * sizeof(ControllerState)],
- sizeof(ControllerState));
+ memcpy(&movPadState, &movInput[frame * sizeof(ControllerState)], sizeof(ControllerState));
PanicAlertFmtT(
"Warning: You loaded a save whose movie mismatches on frame {0}. You should load "
"another save before continuing, or load this state with read-only mode off. "