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

Core: Fix starting movie recording with existing Wii save
dolphin-emu · Mar 19, 2023 · a4d3342 · a4d3342
2 parents fb7a371 + d179ace
commit a4d3342
Showing 1 changed file with 15 additions and 24 deletions.
diff --git a/Source/Core/Core/WiiRoot.cpp b/Source/Core/Core/WiiRoot.cpp
@@ -146,42 +146,33 @@ static void InitializeDeterministicWiiSaves(FS::FileSystem* session_fs,
   if ((NetPlay::IsNetPlayRunning() && SConfig::GetInstance().bCopyWiiSaveNetplay) ||
       (Movie::IsMovieActive() && !Movie::IsStartingFromClearSave()))
   {
-    // Copy the current user's save to the Blank NAND
     auto* sync_fs = boot_session_data.GetWiiSyncFS();
     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)
-      {
-        INFO_LOG_FMT(CORE, "Wii Save Init: Copying {0:016x}.", title);
-        CopySave(sync_fs, session_fs, title);
-      }
+    auto* source_fs = sync_fs ? sync_fs : configured_fs.get();
+    INFO_LOG_FMT(CORE, "Wii Save Init: Copying from {} to session_fs.",
+                 sync_fs ? "sync_fs" : "configured_fs");
 
-      // Copy Mii data
-      if (!CopyNandFile(sync_fs, Common::GetMiiDatabasePath(), session_fs,
-                        Common::GetMiiDatabasePath()))
-      {
-        WARN_LOG_FMT(CORE, "Failed to copy Mii database to the NAND");
-      }
+    // Copy the current user's save to the Blank NAND
+    if (Movie::IsMovieActive() && !NetPlay::IsNetPlayRunning())
+    {
+      INFO_LOG_FMT(CORE, "Wii Save Init: Copying {0:016x}.", title_id);
+      CopySave(source_fs, session_fs, title_id);
     }
     else
     {
-      INFO_LOG_FMT(CORE, "Wii Save Init: Copying from configured_fs to session_fs.");
-
       for (const u64 title : sync_titles)
       {
         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
-      if (!CopyNandFile(configured_fs.get(), Common::GetMiiDatabasePath(), session_fs,
-                        Common::GetMiiDatabasePath()))
-      {
-        WARN_LOG_FMT(CORE, "Failed to copy Mii database to the NAND");
-      }
+    // Copy Mii data
+    if (!CopyNandFile(source_fs, Common::GetMiiDatabasePath(), session_fs,
+                      Common::GetMiiDatabasePath()))
+    {
+      WARN_LOG_FMT(CORE, "Failed to copy Mii database to the NAND");
     }
 
     const auto& netplay_redirect_folder = boot_session_data.GetWiiSyncRedirectFolder();