Merge pull request #8644 from JosJuice/rework-tgc

DiscIO: Rework the implementation of TGC reading
This commit is contained in:
JMC47
2020-09-06 07:06:26 -04:00
committed by GitHub
3 changed files with 65 additions and 99 deletions

View File

@ -263,18 +263,13 @@ void GameList::ShowContextMenu(const QPoint&)
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())
{
const auto selected_games = GetSelectedGames();
if (std::all_of(selected_games.begin(), selected_games.end(), can_convert))
if (std::all_of(selected_games.begin(), selected_games.end(), [](const auto& game) {
return DiscIO::IsDisc(game->GetPlatform()) && game->IsVolumeSizeAccurate();
}))
{
menu->addAction(tr("Convert Selected Files..."), this, &GameList::ConvertFile);
menu->addSeparator();
@ -306,7 +301,7 @@ void GameList::ShowContextMenu(const QPoint&)
{
menu->addAction(tr("Set as &Default ISO"), this, &GameList::SetDefaultISO);
if (can_convert(game))
if (game->IsVolumeSizeAccurate())
menu->addAction(tr("Convert File..."), this, &GameList::ConvertFile);
QAction* change_disc = menu->addAction(tr("Change &Disc"), this, &GameList::ChangeDisc);