]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Don't exit immediately if DBus isn't running
authorAlex Richardson <Alexander.Richardson@cl.cam.ac.uk>
Fri, 9 Jul 2021 08:32:04 +0000 (09:32 +0100)
committerElvis Angelaccio <elvis.angelaccio@kde.org>
Sat, 10 Jul 2021 20:18:28 +0000 (20:18 +0000)
I am trying to run Dolphin on a minimal FreeBSD CHERI-RISC-V QEMU
instance and I haven't got DBus running. Without this change, KDBusService
causes dolphin to exit immediately since the default behaviour is to
exit if it can't connect to DBus.

src/main.cpp

index fba45f43c431b9698e272c5d3676e1e8a3490a9f..ff726401ee74950e3967fe25af25d5f9a8bbe2cc 100644 (file)
@@ -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()) {