diff options
| author | JosJuice <josjuice@gmail.com> | 2020-06-17 12:31:54 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2020-06-17 12:32:39 +0200 |
| commit | 31ecc6c214fc7dba993ec11ef81ae4f5afdf8d19 (patch) | |
| tree | 677eb5cf2d1580adfb9f845ecefdaf40bf732b56 /Source | |
| parent | 75d032161f5d9ca450d21520eaa75a5be2f1f9ee (diff) | |
Revert "DolphinQt: Actually disable converting from TGC"
This reverts commit c236d89f640e05eb38e8bb200d046a22c0b2b202.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinQt/GameList/GameList.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Source/Core/DolphinQt/GameList/GameList.cpp b/Source/Core/DolphinQt/GameList/GameList.cpp index 5efb5bf576..d3f72e14f2 100644 --- a/Source/Core/DolphinQt/GameList/GameList.cpp +++ b/Source/Core/DolphinQt/GameList/GameList.cpp @@ -254,18 +254,16 @@ 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) { + // 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->addSeparator(); @@ -298,7 +296,7 @@ void GameList::ShowContextMenu(const QPoint&) menu->addAction(tr("Set as &Default ISO"), this, &GameList::SetDefaultISO); const auto blob_type = game->GetBlobType(); - 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); |
