ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11665 from JosJuice/fix-movie-wii-save 

Core: Fix starting movie recording with existing Wii save
This commit is contained in:
Admiral H. Curtiss 2023-03-19 01:46:21 +01:00 committed by GitHub
parent fb7a371ac0 d179acef38
commit a4d3342419
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Core/Core/WiiRoot.cpp
View File

@ -146,43 +146,34 @@ static void InitializeDeterministicWiiSaves(FS::FileSystem* session_fs,
if ((NetPlay::IsNetPlayRunning() && SConfig::GetInstance().bCopyWiiSaveNetplay) || if ((NetPlay::IsNetPlayRunning() && SConfig::GetInstance().bCopyWiiSaveNetplay) ||
(Movie::IsMovieActive() && !Movie::IsStartingFromClearSave())) (Movie::IsMovieActive() && !Movie::IsStartingFromClearSave()))
{ {
// Copy the current user's save to the Blank NAND
auto* sync_fs = boot_session_data.GetWiiSyncFS(); auto* sync_fs = boot_session_data.GetWiiSyncFS();
auto& sync_titles = boot_session_data.GetWiiSyncTitles(); auto& sync_titles = boot_session_data.GetWiiSyncTitles();
if (sync_fs)
{
INFO_LOG_FMT(CORE, "Wii Save Init: Copying from sync_fs to session_fs.");
for (const u64 title : sync_titles) auto* source_fs = sync_fs ? sync_fs : configured_fs.get();
{ INFO_LOG_FMT(CORE, "Wii Save Init: Copying from {} to session_fs.",
INFO_LOG_FMT(CORE, "Wii Save Init: Copying {0:016x}.", title); sync_fs ? "sync_fs" : "configured_fs");
CopySave(sync_fs, session_fs, title);
}
// Copy Mii data // Copy the current user's save to the Blank NAND
if (!CopyNandFile(sync_fs, Common::GetMiiDatabasePath(), session_fs, if (Movie::IsMovieActive() && !NetPlay::IsNetPlayRunning())
Common::GetMiiDatabasePath()))
{ {
WARN_LOG_FMT(CORE, "Failed to copy Mii database to the NAND"); INFO_LOG_FMT(CORE, "Wii Save Init: Copying {0:016x}.", title_id);
} CopySave(source_fs, session_fs, title_id);
} }
else else
{ {
INFO_LOG_FMT(CORE, "Wii Save Init: Copying from configured_fs to session_fs.");
for (const u64 title : sync_titles) for (const u64 title : sync_titles)
{ {
INFO_LOG_FMT(CORE, "Wii Save Init: Copying {0:016x}.", title); INFO_LOG_FMT(CORE, "Wii Save Init: Copying {0:016x}.", title);
CopySave(configured_fs.get(), session_fs, title); CopySave(source_fs, session_fs, title);
}
} }
// Copy Mii data // Copy Mii data
if (!CopyNandFile(configured_fs.get(), Common::GetMiiDatabasePath(), session_fs, if (!CopyNandFile(source_fs, Common::GetMiiDatabasePath(), session_fs,
Common::GetMiiDatabasePath())) Common::GetMiiDatabasePath()))
{ {
WARN_LOG_FMT(CORE, "Failed to copy Mii database to the NAND"); WARN_LOG_FMT(CORE, "Failed to copy Mii database to the NAND");
} }
}
const auto& netplay_redirect_folder = boot_session_data.GetWiiSyncRedirectFolder(); const auto& netplay_redirect_folder = boot_session_data.GetWiiSyncRedirectFolder();
if (!netplay_redirect_folder.empty()) if (!netplay_redirect_folder.empty())