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

DolphinWX: Don't include skipped items in the compression count

This commit is contained in:
JosJuice 2015-12-17 19:00:41 +01:00
parent 8cad70238c
commit 8a2e678ea7
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Source/Core/DolphinWX/GameListCtrl.cpp
View File

@ -1099,20 +1099,26 @@ void CGameListCtrl::OnMultiDecompressISO(wxCommandEvent& /*event*/)
void CGameListCtrl::CompressSelection(bool _compress) void CGameListCtrl::CompressSelection(bool _compress)
{ {
const std::vector<const GameListItem*> selected_items = GetAllSelectedISOs(); std::vector<const GameListItem*> items_to_compress;
bool wii_compression_warning_accepted = false;
// If any Wii discs are going to be compressed, show the Wii compression warning once for (const GameListItem* iso : GetAllSelectedISOs())
if (_compress)
{ {
for (const GameListItem* iso : selected_items) // Don't include items that we can't do anything with
if (iso->GetPlatform() != DiscIO::IVolume::GAMECUBE_DISC && iso->GetPlatform() != DiscIO::IVolume::WII_DISC)
continue;
if (iso->GetBlobType() != DiscIO::BlobType::PLAIN && iso->GetBlobType() != DiscIO::BlobType::GCZ)
continue;
items_to_compress.push_back(iso);
// Show the Wii compression warning if it's relevant and it hasn't been shown already
if (!wii_compression_warning_accepted && _compress &&
!iso->IsCompressed() && iso->GetPlatform() == DiscIO::IVolume::WII_DISC)
{ {
if (!iso->IsCompressed() && iso->GetPlatform() == DiscIO::IVolume::WII_DISC) if (WiiCompressWarning())
{ wii_compression_warning_accepted = true;
if (WiiCompressWarning()) else
break; return;
else
return;
}
} }
} }
@ -1138,15 +1144,10 @@ void CGameListCtrl::CompressSelection(bool _compress)
wxPD_SMOOTH wxPD_SMOOTH
); );
CompressionProgress progress(0, GetSelectedItemCount(), "", &progressDialog); CompressionProgress progress(0, items_to_compress.size(), "", &progressDialog);
for (const GameListItem* iso : selected_items) for (const GameListItem* iso : items_to_compress)
{ {
if (iso->GetPlatform() != DiscIO::IVolume::GAMECUBE_DISC && iso->GetPlatform() != DiscIO::IVolume::WII_DISC)
continue;
if (iso->GetBlobType() != DiscIO::BlobType::PLAIN && iso->GetBlobType() != DiscIO::BlobType::GCZ)
continue;
if (!iso->IsCompressed() && _compress) if (!iso->IsCompressed() && _compress)
{ {
std::string FileName; std::string FileName;