Merge pull request #1113 from Al12rs/bettr_wait_on_events

Use QEventLoop instead of manually calling ProcessEvents

1 files changed, 14 insertions, 5 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index c3a19bf4..fc766af6 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2129,11 +2129,20 @@ void MainWindow::activateProxy(bool activate)
   busyDialog.setWindowFlags(busyDialog.windowFlags() & ~Qt::WindowContextHelpButtonHint);
   busyDialog.setWindowModality(Qt::WindowModal);
   busyDialog.show();
-  QFuture<void> future = QtConcurrent::run(MainWindow::setupNetworkProxy, activate);
-  while (!future.isFinished()) {
-    QCoreApplication::processEvents();
-    ::Sleep(100);
-  }
+  
+  QFutureWatcher<void> futureWatcher;
+  QEventLoop loop;
+  connect(&futureWatcher, &QFutureWatcher<void>::finished,
+          &loop, &QEventLoop::quit,
+          Qt::QueuedConnection);
+
+  futureWatcher.setFuture(
+    QtConcurrent::run(MainWindow::setupNetworkProxy, activate)
+  );
+  
+  // wait for setupNetworkProxy while keeping ui responsive
+  loop.exec();
+
   busyDialog.hide();
 }