OSDN Git Service

kscreensaver: kill the xscreensaver daemon process after disconnecting the state...
authorIvailo Monev <xakepa10@gmail.com>
Sat, 7 May 2022 00:01:04 +0000 (03:01 +0300)
committerIvailo Monev <xakepa10@gmail.com>
Sat, 7 May 2022 00:01:04 +0000 (03:01 +0300)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
kscreensaver/kscreensaver.cpp

index 2d67363..a65d378 100644 (file)
@@ -129,15 +129,15 @@ KScreenSaver::~KScreenSaver()
         connection.unregisterObject("/org/freedesktop/ScreenSaver");
     }
 
-    if (m_xscreensaverpid > 0) {
-        ::kill(pid_t(m_xscreensaverpid), SIGTERM);
-    }
-
     if (m_xscreensaver) {
         disconnect(m_xscreensaver, SIGNAL(readyReadStandardOutput()), this, SLOT(slotXScreenSaverOutput()));
         disconnect(m_xscreensaver, SIGNAL(readyReadStandardError()), this, SLOT(slotXScreenSaverError()));
         m_xscreensaver->deleteLater();
     }
+
+    if (m_xscreensaverpid > 0) {
+        ::kill(pid_t(m_xscreensaverpid), SIGTERM);
+    }
 }
 
 bool KScreenSaver::GetActive()