Enable DBus IPC master mode if DBus session bus is unavailable

Pelagicore · Apr 30, 2020 · 0cc5f04 · 0cc5f04
1 parent 20b6966
commit 0cc5f04
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/ipc/dbus/DBusObjectRegistry.cpp b/src/ipc/dbus/DBusObjectRegistry.cpp
@@ -54,7 +54,7 @@ void DBusObjectRegistry::init()
 {
     if (!m_initialized) {
         m_initialized = true;
-        if (m_dbusManager.registerServiceName(m_serviceName)) {
+        if (!m_dbusManager.isDBusConnected() || m_dbusManager.registerServiceName(m_serviceName)) {
             m_master = std::make_unique<MasterImpl>();
             m_master->init();
             QObject::connect(m_master.get(), &MasterImpl::objectAdded, this, &DBusObjectRegistry::onObjectAdded);
@@ -123,6 +123,7 @@ void DBusObjectRegistry::syncObjects()
     ObjectRegistryIPCDBusProxy objectRegistryProxy;
     objectRegistryProxy.ipc()->setServiceName(m_serviceName);
     objectRegistryProxy.connectToServer();
+    Q_ASSERT(objectRegistryProxy.ready());
     updateObjects(objectRegistryProxy.getObjects());
 }