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

DolphinQt: Actually disable converting from TGC 

When I made PR 8773, I only covered the case where multiple files
are selected, not the more common case where one file is selected.
Oops
This commit is contained in:
JosJuice 2020-06-16 11:21:44 +02:00
parent 26789163e2
commit c236d89f64
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,16 +254,18 @@ void GameList::ShowContextMenu(const QPoint&)
QMenu* menu = new QMenu(this); QMenu* menu = new QMenu(this);
const auto can_convert = [](const std::shared_ptr<const UICommon::GameFile>& game) {
// Converting from TGC is temporarily disabled because PR #8738 was merged prematurely.
// The TGC check will be removed by PR #8644.
return DiscIO::IsDisc(game->GetPlatform()) && game->IsVolumeSizeAccurate() &&
game->GetBlobType() != DiscIO::BlobType::TGC;
};
if (HasMultipleSelected()) if (HasMultipleSelected())
{ {
const auto selected_games = GetSelectedGames(); const auto selected_games = GetSelectedGames();
if (std::all_of(selected_games.begin(), selected_games.end(), [](const auto& game) { if (std::all_of(selected_games.begin(), selected_games.end(), can_convert))
// Converting from TGC is temporarily disabled because PR #8738 was merged prematurely.
// The TGC check will be removed by PR #8644.
return DiscIO::IsDisc(game->GetPlatform()) && game->IsVolumeSizeAccurate() &&
game->GetBlobType() != DiscIO::BlobType::TGC;
}))
{ {
menu->addAction(tr("Convert Selected Files..."), this, &GameList::ConvertFile); menu->addAction(tr("Convert Selected Files..."), this, &GameList::ConvertFile);
menu->addSeparator(); menu->addSeparator();
@ -296,7 +298,7 @@ void GameList::ShowContextMenu(const QPoint&)
menu->addAction(tr("Set as &Default ISO"), this, &GameList::SetDefaultISO); menu->addAction(tr("Set as &Default ISO"), this, &GameList::SetDefaultISO);
const auto blob_type = game->GetBlobType(); const auto blob_type = game->GetBlobType();
if (game->IsVolumeSizeAccurate()) if (can_convert(game))
menu->addAction(tr("Convert File..."), this, &GameList::ConvertFile); menu->addAction(tr("Convert File..."), this, &GameList::ConvertFile);
QAction* change_disc = menu->addAction(tr("Change &Disc"), this, &GameList::ChangeDisc); QAction* change_disc = menu->addAction(tr("Change &Disc"), this, &GameList::ChangeDisc);