summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/ConvertDialog.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2020-06-25 16:44:02 +0200
committerJosJuice <josjuice@gmail.com>2020-06-25 16:44:02 +0200
commita2c51e027f5c1cd5b8574c9023dcd22c254f1d00 (patch)
tree4c343bed673dec715bf2bc0a0ddf9dfa05c1fbbd /Source/Core/DolphinQt/ConvertDialog.cpp
parent94fd5831472cc924842fe939d031be2cd8679be2 (diff)
DolphinQt: Fix a -Wshadow warning in ConvertDialog
Diffstat (limited to 'Source/Core/DolphinQt/ConvertDialog.cpp')
-rw-r--r--Source/Core/DolphinQt/ConvertDialog.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/DolphinQt/ConvertDialog.cpp b/Source/Core/DolphinQt/ConvertDialog.cpp
index c21691b4a9..49fc9e8975 100644
--- a/Source/Core/DolphinQt/ConvertDialog.cpp
+++ b/Source/Core/DolphinQt/ConvertDialog.cpp
@@ -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,
@@ -500,7 +500,7 @@ void ConvertDialog::Convert()
}
progress_dialog.GetRaw()->exec();
- if (!good.get())
+ if (!success.get())
{
ModalMessageBox::critical(this, tr("Error"),
tr("Dolphin failed to complete the requested action."));