From 5e9269b8540ea207d08d3296d161b30f8f9d910f Mon Sep 17 00:00:00 2001
From: Abdurrahman AVCI <abdurrahmanavci@gmail.com>
Date: Mon, 28 Jan 2013 02:45:51 +0000
Subject: [PATCH] Wait for server to finish after kill signal.

---
 src/DisplayManager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/DisplayManager.cpp b/src/DisplayManager.cpp
index bcaaf60..c2a8dc6 100644
--- a/src/DisplayManager.cpp
+++ b/src/DisplayManager.cpp
@@ -101,10 +101,10 @@ namespace SDE {
             return false;
         // send terminate signal
         d->serverProcess->terminate();
-        // wait for finished
-        d->serverProcess->waitForFinished();
+	d->serverProcess->waitForFinished(1000);
         // send kill signal
         d->serverProcess->kill();
+        d->serverProcess->waitForFinished();
         // clean up
         delete d->serverProcess;
         d->serverProcess = nullptr;