From f481109417dd61567ff96ff13682b32715e54aee Mon Sep 17 00:00:00 2001 From: Shubham Jangra Date: Thu, 30 May 2019 23:11:30 +0530 Subject: [PATCH] Do not move further if system bus is not connected Reviewers: stikonas, cjlcarvalho Reviewed By: stikonas Differential Revision: https://phabricator.kde.org/D21506 --- src/util/externalcommand.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/util/externalcommand.cpp b/src/util/externalcommand.cpp index 360a5dc..0568bb6 100644 --- a/src/util/externalcommand.cpp +++ b/src/util/externalcommand.cpp @@ -124,6 +124,11 @@ bool ExternalCommand::start(int timeout) if (command().isEmpty()) return false; + if (!QDBusConnection::systemBus().isConnected()) { + qWarning() << QDBusConnection::systemBus().lastError().message(); + return false; + } + if (report()) report()->setCommand(xi18nc("@info:status", "Command: %1 %2", command(), args().join(QStringLiteral(" ")))); @@ -134,11 +139,6 @@ bool ExternalCommand::start(int timeout) if (cmd.isEmpty()) cmd = QStandardPaths::findExecutable(command(), { QStringLiteral("/sbin/"), QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/") }); - if (!QDBusConnection::systemBus().isConnected()) { - qWarning() << QDBusConnection::systemBus().lastError().message(); - return false; - } - auto *interface = new org::kde::kpmcore::externalcommand(QStringLiteral("org.kde.kpmcore.externalcommand"), QStringLiteral("/Helper"), QDBusConnection::systemBus(), this);