piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

WiiSave: In Import(), make sure the TMD exists or can be reinstalled before allowing save to be imported.

Browse Source
This commit is contained in:
Admiral H. Curtiss
2020-12-31 19:33:48 +01:00
parent 46e4c17db3
commit 700d53e00f
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Core/HW/WiiSave.cpp
View File

@ -40,6 +40,7 @@
#include "Core/IOS/IOS.h" #include "Core/IOS/IOS.h"
#include "Core/IOS/IOSC.h" #include "Core/IOS/IOSC.h"
#include "Core/IOS/Uids.h" #include "Core/IOS/Uids.h"
#include "Core/WiiUtils.h"
namespace WiiSave namespace WiiSave
{ {
@ -475,6 +476,14 @@ bool Import(const std::string& data_bin_path, std::function<bool()> can_overwrit
ERROR_LOG_FMT(CORE, "WiiSave::Import: Failed to read header"); ERROR_LOG_FMT(CORE, "WiiSave::Import: Failed to read header");
return false; return false;
} }
if (!WiiUtils::EnsureTMDIsImported(*ios.GetFS(), *ios.GetES(), header->tid))
{
ERROR_LOG_FMT(CORE, "WiiSave::Import: Failed to find or import TMD for title {:16x}",
header->tid);
return false;
}
const auto nand = MakeNandStorage(ios.GetFS().get(), header->tid); const auto nand = MakeNandStorage(ios.GetFS().get(), header->tid);
if (nand->SaveExists() && !can_overwrite()) if (nand->SaveExists() && !can_overwrite())
return false; return false;