Make sure the tty is not occupuied after stopping the service

Ensures that we will not still find an X server still on the tty if we restart SDDM.
sddm · Mar 14, 2022 · 0b07df7 · 0b07df7
1 parent 7a16cd7
commit 0b07df7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
@@ -202,8 +202,10 @@ namespace SDDM {
         process->terminate();
 
         // wait for finished
-        if (!process->waitForFinished(5000))
+        if (!process->waitForFinished(5000)) {
             process->kill();
+            process->waitForFinished(25000);
+        }
     }
 
     void XorgDisplayServer::finished() {

diff --git a/src/helper/waylandhelper.cpp b/src/helper/waylandhelper.cpp
@@ -60,8 +60,10 @@ void stopProcess(QProcess *process)
     if (process && process->state() != QProcess::NotRunning) {
         qInfo() << "Stopping..." << process->program();
         process->terminate();
-        if (!process->waitForFinished(5000))
+        if (!process->waitForFinished(5000)) {
             process->kill();
+            process->waitForFinished(25000);
+        }
         process->deleteLater();
         process = nullptr;
     }

diff --git a/src/helper/xorguserhelper.cpp b/src/helper/xorguserhelper.cpp
@@ -86,8 +86,10 @@ void XOrgUserHelper::stop()
     if (m_serverProcess) {
         qInfo("Stopping server...");
         m_serverProcess->terminate();
-        if (!m_serverProcess->waitForFinished(5000))
+        if (!m_serverProcess->waitForFinished(5000)) {
             m_serverProcess->kill();
+            m_serverProcess->waitForFinished(25000);
+        }
         m_serverProcess->deleteLater();
         m_serverProcess = nullptr;