Wait for display setup script no more than 30s

Kill the script if it takes long.
sddm · Jun 24, 2015 · f083c1e · f083c1e
1 parent 7ed4ab1
commit f083c1e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
@@ -290,7 +290,10 @@ namespace SDDM {
         // start display setup script
         qDebug() << "Running display setup script " << displayCommand;
         displayScript->start(displayCommand);
-        displayScript->waitForFinished(-1);
+
+        // wait for finished
+        if (!displayScript->waitForFinished(30000))
+            displayScript->kill();
     }
 
     void XorgDisplayServer::changeOwner(const QString &fileName) {