piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix exporting all saves in memcardmanager

Browse Source
This commit is contained in:
LPFaint99 2014-04-02 22:51:46 -07:00
parent ca9ee3586f
commit 6333a4b5ba
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Core/HW/GCMemcard.cpp
View File

@ -904,9 +904,17 @@ u32 GCMemcard::ExportGci(u8 index, const std::string& fileName, const std::strin
File::IOFile gci; File::IOFile gci;
int offset = GCI; int offset = GCI;
gci.Open(fileName, "wb"); if (!fileName.length())
{
std::string gciFilename;
// GCI_FileName should only fail if the gamecode is 0xFFFFFFFF
if (!GCI_FileName(index, gciFilename)) return SUCCESS;
gci.Open(directory + DIR_SEP + gciFilename, "wb");
}
else
{
std::string fileType; std::string fileType;
gci.Open(fileName, "wb");
SplitPath(fileName, nullptr, nullptr, &fileType); SplitPath(fileName, nullptr, nullptr, &fileType);
if (!strcasecmp(fileType.c_str(), ".gcs")) if (!strcasecmp(fileType.c_str(), ".gcs"))
{ {
@ -916,6 +924,7 @@ u32 GCMemcard::ExportGci(u8 index, const std::string& fileName, const std::strin
{ {
offset = SAV; offset = SAV;
} }
}
if (!gci) if (!gci)
return OPENFAIL; return OPENFAIL;

2
Source/Core/DolphinWX/MemcardManager.cpp
View File

@ -605,7 +605,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
"%s\nand have the same name as a file on your memcard\nContinue?", path1.c_str())) "%s\nand have the same name as a file on your memcard\nContinue?", path1.c_str()))
for (int i = 0; i < DIRLEN; i++) for (int i = 0; i < DIRLEN; i++)
{ {
CopyDeleteSwitch(memoryCard[slot]->ExportGci(i, nullptr, path1), -1); CopyDeleteSwitch(memoryCard[slot]->ExportGci(i, "", path1), -1);
} }
break; break;
} }