Skip to content
Permalink
Browse files
Merge pull request #8899 from JosJuice/convert-dialog-wswitch
DolphinQt: Fix some warnings in ConvertDialog
  • Loading branch information
Tilka committed Jun 25, 2020
2 parents 6468978 + a2c51e0 commit 4ddd4ff
Showing 1 changed file with 9 additions and 5 deletions.
@@ -457,12 +457,12 @@ void ConvertDialog::Convert()
}
else
{
std::future<bool> good;
std::future<bool> success;

switch (format)
{
case DiscIO::BlobType::PLAIN:
good = std::async(std::launch::async, [&] {
success = std::async(std::launch::async, [&] {
const bool good =
DiscIO::ConvertToPlain(blob_reader.get(), original_path, dst_path.toStdString(),
&CompressCB, &progress_dialog);
@@ -472,7 +472,7 @@ void ConvertDialog::Convert()
break;

case DiscIO::BlobType::GCZ:
good = std::async(std::launch::async, [&] {
success = std::async(std::launch::async, [&] {
const bool good =
DiscIO::ConvertToGCZ(blob_reader.get(), original_path, dst_path.toStdString(),
file->GetPlatform() == DiscIO::Platform::WiiDisc ? 1 : 0,
@@ -484,7 +484,7 @@ void ConvertDialog::Convert()

case DiscIO::BlobType::WIA:
case DiscIO::BlobType::RVZ:
good = std::async(std::launch::async, [&] {
success = std::async(std::launch::async, [&] {
const bool good = DiscIO::ConvertToWIAOrRVZ(
blob_reader.get(), original_path, dst_path.toStdString(),
format == DiscIO::BlobType::RVZ, compression, compression_level, block_size,
@@ -493,10 +493,14 @@ void ConvertDialog::Convert()
return good;
});
break;

default:
ASSERT(false);
break;
}

progress_dialog.GetRaw()->exec();
if (!good.get())
if (!success.get())
{
ModalMessageBox::critical(this, tr("Error"),
tr("Dolphin failed to complete the requested action."));

0 comments on commit 4ddd4ff

Please sign in to comment.