From e8806542035d20a354b41060b035303f34eb8615 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Thu, 22 Sep 2016 02:12:56 +0000 Subject: [PATCH] [transfer-engine] Register DBus object before service. Contributes to JB#36015 --- src/transferengine.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/transferengine.cpp b/src/transferengine.cpp index 0a739a1..dbd1e9c 100644 --- a/src/transferengine.cpp +++ b/src/transferengine.cpp @@ -780,14 +780,14 @@ TransferEngine::TransferEngine(QObject *parent) : TransferDBRecord::registerType(); QDBusConnection connection = QDBusConnection::sessionBus(); - if (!connection.registerService("org.nemo.transferengine")) { - qFatal("DBUS service already taken. Kill the other instance first."); - } - if (!connection.registerObject("/org/nemo/transferengine", this)) { qFatal("Could not register object \'/org/nemo/transferengine\'"); } + if (!connection.registerService("org.nemo.transferengine")) { + qFatal("DBUS service already taken. Kill the other instance first."); + } + new TransferEngineAdaptor(this); // Let's make sure that db is open by creating