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

WiiSave: Fixes directory issues

This commit is contained in:
Sepalani 2016-12-15 00:53:52 +00:00
parent 49384208cf
commit 9774b3f640
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/Core/HW/WiiSaveCrypted.cpp
View File

@ -337,10 +337,11 @@ void CWiiSaveCrypted::ImportWiiSaveFiles()
}
else
{
std::string filename =
Common::EscapeFileName(reinterpret_cast<const char*>(file_hdr_tmp.name));
// Allows files in subfolders to be escaped properly (ex: "nocopy/data00")
// Special characters in path components will be escaped such as /../
std::string file_path = Common::EscapePath(reinterpret_cast<const char*>(file_hdr_tmp.name));
std::string file_path_full = m_wii_title_path + filename;
std::string file_path_full = m_wii_title_path + file_path;
File::CreateFullPath(file_path_full);
if (file_hdr_tmp.type == 1)
{
@ -369,6 +370,20 @@ void CWiiSaveCrypted::ImportWiiSaveFiles()
raw_save_file.WriteBytes(&file_data[0], file_size);
}
}
else if (file_hdr_tmp.type == 2)
{
if (!File::Exists(file_path_full))
{
if (!File::CreateDir(file_path_full))
ERROR_LOG(CONSOLE, "Failed to create directory %s", file_path_full.c_str());
}
else if (!File::IsDirectory(file_path_full))
{
ERROR_LOG(CONSOLE,
"Failed to create directory %s because a file with the same name exists",
file_path_full.c_str());
}
}
}
}
}