You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
44 lines
1.4 KiB
44 lines
1.4 KiB
4 years ago
|
From bf11c835ebd934d9916327262f23edb25aeb8ab8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Nate Graham <nate@kde.org>
|
||
|
|
Date: Thu, 29 Oct 2020 15:00:39 -0600
|
||
|
|
Subject: [PATCH 75/75] Disable session management for daemon
|
||
|
|
|
||
|
|
We don't need to autostart the daemon if it was running at logout.
|
||
|
|
|
||
|
|
BUG: 417219
|
||
|
|
FIXED-IN: 20.12
|
||
|
|
---
|
||
|
|
src/main.cpp | 9 +++++++++
|
||
|
|
1 file changed, 9 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/src/main.cpp b/src/main.cpp
|
||
|
|
index 9191127e5..d557f2ea0 100644
|
||
|
|
--- a/src/main.cpp
|
||
|
|
+++ b/src/main.cpp
|
||
|
|
@@ -26,6 +26,7 @@
|
||
|
|
#include <QDBusInterface>
|
||
|
|
#include <QDBusAbstractInterface>
|
||
|
|
#include <QDBusConnectionInterface>
|
||
|
|
+#include <QSessionManager>
|
||
|
|
|
||
|
|
#ifndef Q_OS_WIN
|
||
|
|
#include <unistd.h>
|
||
|
|
@@ -132,6 +133,14 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
|
||
|
|
|
||
|
|
|
||
|
|
if (parser.isSet(QStringLiteral("daemon"))) {
|
||
|
|
+ // Disable session management for the daemonized version
|
||
|
|
+ // See https://bugs.kde.org/show_bug.cgi?id=417219
|
||
|
|
+ auto disableSessionManagement = [](QSessionManager &sm) {
|
||
|
|
+ sm.setRestartHint(QSessionManager::RestartNever);
|
||
|
|
+ };
|
||
|
|
+ QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
|
||
|
|
+ QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
|
||
|
|
+
|
||
|
|
KDBusService dolphinDBusService;
|
||
|
|
DBusInterface interface;
|
||
|
|
interface.setAsDaemon();
|
||
|
|
--
|
||
|
|
2.28.0
|
||
|
|
|