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

Merge pull request #9409 from AdmiralCurtiss/wii-save-import-tmd

Browse Source 
Make WiiSave::Import() behave closer to the Wii System Menu's SD Card save copying.
This commit is contained in:
Léo Lam
2021-01-05 15:36:36 +01:00
committed by GitHub
parent e48377dfc6 2932b5f8cd
commit 840ecfb32f
9 changed files with 254 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/DolphinQt/GameList/GameList.cpp
View File

@ -452,8 +452,11 @@ void GameList::ExportWiiSave()
QList<std::string> failed;
for (const auto& game : GetSelectedGames())
{
if (!WiiSave::Export(game->GetTitleID(), export_dir.toStdString()))
if (WiiSave::Export(game->GetTitleID(), export_dir.toStdString()) !=
WiiSave::CopyResult::Success)
{
failed.push_back(game->GetName(UICommon::GameFile::Variant::LongAndPossiblyCustom));
}
}
if (!failed.isEmpty())

42
Source/Core/DolphinQt/MenuBar.cpp
View File

@ -1066,19 +1066,39 @@ void MenuBar::ImportWiiSave()
if (file.isEmpty())
return;
bool cancelled = false;
auto can_overwrite = [&] {
bool yes = ModalMessageBox::question(
this, tr("Save Import"),
tr("Save data for this title already exists in the NAND. Consider backing up "
"the current data before overwriting.\nOverwrite now?")) == QMessageBox::Yes;
cancelled = !yes;
return yes;
return ModalMessageBox::question(
this, tr("Save Import"),
tr("Save data for this title already exists in the NAND. Consider backing up "
"the current data before overwriting.\nOverwrite now?")) == QMessageBox::Yes;
};
if (WiiSave::Import(file.toStdString(), can_overwrite))
ModalMessageBox::information(this, tr("Save Import"), tr("Successfully imported save files."));
else if (!cancelled)
ModalMessageBox::critical(this, tr("Save Import"), tr("Failed to import save files."));
const auto result = WiiSave::Import(file.toStdString(), can_overwrite);
switch (result)
{
case WiiSave::CopyResult::Success:
ModalMessageBox::information(this, tr("Save Import"), tr("Successfully imported save file."));
break;
case WiiSave::CopyResult::CorruptedSource:
ModalMessageBox::critical(this, tr("Save Import"),
tr("Failed to import save file. The given file appears to be "
"corrupted or is not a valid Wii save."));
break;
case WiiSave::CopyResult::TitleMissing:
ModalMessageBox::critical(
this, tr("Save Import"),
tr("Failed to import save file. Please launch the game once, then try again."));
break;
case WiiSave::CopyResult::Cancelled:
break;
default:
ModalMessageBox::critical(
this, tr("Save Import"),
tr("Failed to import save file. Your NAND may be corrupt, or something is preventing "
"access to files within it. Try repairing your NAND (Tools -> Manage NAND -> Check "
"NAND...), then import the save again."));
break;
}
}
void MenuBar::ExportWiiSaves()