Merge branch 'release/21.08'

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index fba45f43c431b9698e272c5d3676e1e8a3490a9f..ff726401ee74950e3967fe25af25d5f9a8bbe2cc 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -178,7 +178,12 @@ int main(int argc, char **argv)
 
     mainWindow->show();
 
-    KDBusService dolphinDBusService;
+    // Allow starting Dolphin on a system that is not running DBus:
+    KDBusService::StartupOptions serviceOptions = KDBusService::Multiple;
+    if (!QDBusConnection::sessionBus().isConnected()) {
+        serviceOptions |= KDBusService::NoExitOnFailure;
+    }
+    KDBusService dolphinDBusService(serviceOptions);
     DBusInterface interface;
 
     if (!app.isSessionRestored()) {