summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2023-03-16 22:45:40 +0100
committerJosJuice <josjuice@gmail.com>2023-03-16 22:45:40 +0100
commit9e7409e71e5e7f026b07df6272c9b37a2e504e79 (patch)
treee24063559b9f05f29a11bd07bb98dd45990ec033 /Source/Core
parent6b545eaada79a45c3bd901bbc85f77f66e17bbf3 (diff)
Core: Fix starting movie recording with existing Wii save
A change made in 0d095b4 didn't take into account that the movie system doesn't set sync_titles.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/WiiRoot.cpp28
1 files changed, 22 insertions, 6 deletions
diff --git a/Source/Core/Core/WiiRoot.cpp b/Source/Core/Core/WiiRoot.cpp
index 7311a6b725..cdf77037c2 100644
--- a/Source/Core/Core/WiiRoot.cpp
+++ b/Source/Core/Core/WiiRoot.cpp
@@ -153,10 +153,18 @@ static void InitializeDeterministicWiiSaves(FS::FileSystem* session_fs,
{
INFO_LOG_FMT(CORE, "Wii Save Init: Copying from sync_fs to session_fs.");
- for (const u64 title : sync_titles)
+ if (Movie::IsMovieActive() && !NetPlay::IsNetPlayRunning())
{
- INFO_LOG_FMT(CORE, "Wii Save Init: Copying {0:016x}.", title);
- CopySave(sync_fs, session_fs, title);
+ INFO_LOG_FMT(CORE, "Wii Save Init: Copying {0:016x}.", title_id);
+ CopySave(sync_fs, session_fs, title_id);
+ }
+ else
+ {
+ for (const u64 title : sync_titles)
+ {
+ INFO_LOG_FMT(CORE, "Wii Save Init: Copying {0:016x}.", title);
+ CopySave(sync_fs, session_fs, title);
+ }
}
// Copy Mii data
@@ -170,10 +178,18 @@ static void InitializeDeterministicWiiSaves(FS::FileSystem* session_fs,
{
INFO_LOG_FMT(CORE, "Wii Save Init: Copying from configured_fs to session_fs.");
- for (const u64 title : sync_titles)
+ if (Movie::IsMovieActive() && !NetPlay::IsNetPlayRunning())
+ {
+ INFO_LOG_FMT(CORE, "Wii Save Init: Copying {0:016x}.", title_id);
+ CopySave(configured_fs.get(), session_fs, title_id);
+ }
+ else
{
- INFO_LOG_FMT(CORE, "Wii Save Init: Copying {0:016x}.", title);
- CopySave(configured_fs.get(), session_fs, title);
+ for (const u64 title : sync_titles)
+ {
+ INFO_LOG_FMT(CORE, "Wii Save Init: Copying {0:016x}.", title);
+ CopySave(configured_fs.get(), session_fs, title);
+ }
}
// Copy Mii data