Merge remote-tracking branch 'origin/3.0' into master

Change-Id: I601b783a9d2eed009737b2779803457949cbb014

2 files changed, 5 insertions, 4 deletions

diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 9b9c986e0..4e8931d9a 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -846,12 +846,13 @@ PackageManagerCore::PackageManagerCore(qint64 magicmaker, const QList<OperationB
 
     // Creates and initializes a remote client, makes us get admin rights for QFile, QSettings
     // and QProcess operations. Init needs to called to set the server side authorization key.
-    RemoteClient::instance().init(socketName, key, mode, Protocol::StartAs::SuperUser);
+    if (!d->isUpdater()) {
+        RemoteClient::instance().init(socketName, key, mode, Protocol::StartAs::SuperUser);
+        RemoteClient::instance().setAuthorizationFallbackDisabled(settings().disableAuthorizationFallback());
+    }
 
     d->initialize(QHash<QString, QString>());
 
-    RemoteClient::instance().setAuthorizationFallbackDisabled(settings().disableAuthorizationFallback());
-
     //
     // Sanity check to detect a broken installations with missing operations.
     // Every installed package should have at least one MinimalProgress operation.
diff --git a/src/libs/kdtools/filedownloader.cpp b/src/libs/kdtools/filedownloader.cpp
index 87dfd21b4..8032bbe22 100644
--- a/src/libs/kdtools/filedownloader.cpp
+++ b/src/libs/kdtools/filedownloader.cpp
@@ -1336,7 +1336,7 @@ void KDUpdater::HttpDownloader::httpDone(bool error)
             d->aborted = false;
             setDownloadCanceled();
         } else {
-            d->shutDown(false);
+            setDownloadAborted(err);
             return;
         }
     }