From 2c03cfacc2d7a76b54e315c957b7ce39e09dad13 Mon Sep 17 00:00:00 2001 From: Michael M Date: Sat, 1 Jul 2017 13:16:18 -0700 Subject: [PATCH] Qt WiiUpdate: use QueueOnObject instead of Core::QueueHostJob --- Source/Core/DolphinQt2/WiiUpdate.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Source/Core/DolphinQt2/WiiUpdate.cpp b/Source/Core/DolphinQt2/WiiUpdate.cpp index 8db46852e0..de91fc0e32 100644 --- a/Source/Core/DolphinQt2/WiiUpdate.cpp +++ b/Source/Core/DolphinQt2/WiiUpdate.cpp @@ -18,6 +18,7 @@ #include "Core/Core.h" #include "Core/WiiUtils.h" #include "DiscIO/NANDImporter.h" +#include "DolphinQt2/QtUtils/QueueOnObject.h" namespace WiiUpdate { @@ -62,21 +63,19 @@ void PerformOnlineUpdate(const std::string& region, QWidget* parent) std::future result = std::async(std::launch::async, [&] { const WiiUtils::UpdateResult res = WiiUtils::DoOnlineUpdate( [&](size_t processed, size_t total, u64 title_id) { - Core::QueueHostJob( - [&dialog, &was_cancelled, processed, total, title_id]() { - if (was_cancelled.IsSet()) - return; + QueueOnObject(&dialog, [&dialog, &was_cancelled, processed, total, title_id]() { + if (was_cancelled.IsSet()) + return; - dialog.setRange(0, static_cast(total)); - dialog.setValue(static_cast(processed)); - dialog.setLabelText(QObject::tr("Updating title %1...\nThis can take a while.") - .arg(title_id, 16, 16, QLatin1Char('0'))); - }, - true); + dialog.setRange(0, static_cast(total)); + dialog.setValue(static_cast(processed)); + dialog.setLabelText(QObject::tr("Updating title %1...\nThis can take a while.") + .arg(title_id, 16, 16, QLatin1Char('0'))); + }); return !was_cancelled.IsSet(); }, region); - Core::QueueHostJob([&dialog] { dialog.close(); }, true); + QueueOnObject(&dialog, [&dialog] { dialog.close(); }); return res; });