src/daemon/XorgDisplayServer.cpp: wait for DisplayStopCommand to finish

Alberto Milone · Alberto Milone · commit 9b833d5ab883 · 2015-04-10T17:39:21.000+02:00
Also make sure to free the memory allocated for DisplayCommand
diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
@@ -250,6 +250,14 @@ namespace SDDM {
         qDebug() << "Running display stop script " << displayStopCommand;
         displayStopScript->start(displayStopCommand);
 
+        // wait for finished
+        if (!displayStopScript->waitForFinished(5000))
+            displayStopScript->kill();
+
+        // clean up the script process
+        displayStopScript->deleteLater();
+        displayStopScript = nullptr;
+
         // clean up
         process->deleteLater();
         process = nullptr;
@@ -276,6 +284,9 @@ namespace SDDM {
         env.insert("SHELL", "/bin/sh");
         displayScript->setProcessEnvironment(env);
 
+        // delete displayScript on finish
+        connect(displayScript, SIGNAL(finished(int,QProcess::ExitStatus)), displayScript, SLOT(deleteLater()));
+
         // start display setup script
         qDebug() << "Running display setup script " << displayCommand;
         displayScript->start(displayCommand);
