From 8d00e1dc8c969749af5096f005b463b8fb5e82f2 Mon Sep 17 00:00:00 2001 From: Max Paperno Date: Mon, 16 Jul 2018 17:48:19 -0400 Subject: [PATCH] [Companion][MainWindow] Allow aborting version update check network request. --- companion/src/mainwindow.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index 00d50647f..855d1c5cf 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -51,9 +51,12 @@ #include "dialogs/filesyncdialog.h" #include -#include #include #include +#include +#include +#include +#include // update check flags #define CHECK_COMPANION 1 @@ -302,7 +305,9 @@ void MainWindow::checkForUpdates() QNetworkRequest request(url); request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork); - networkManager->get(request); + QNetworkReply * repl = networkManager->get(request); + if (downloadDialog_forWait) + connect(downloadDialog_forWait, &downloadDialog::rejected, repl, &QNetworkReply::abort); } void MainWindow::onUpdatesError(const QString &err)