From 34a78bf10e27d517e20880f875a0ebf63f3db86d Mon Sep 17 00:00:00 2001
From: Fulgen301 <tokmajigeorge@gmail.com>
Date: Mon, 4 Jun 2018 20:32:08 +0200
Subject: Fix shutdown

---
 pycrctrl.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 pycrctrl.py

(limited to 'pycrctrl.py')

diff --git a/pycrctrl.py b/pycrctrl.py
old mode 100755
new mode 100644
index 3c0c5d3..9b43212
--- a/pycrctrl.py
+++ b/pycrctrl.py
@@ -290,6 +290,8 @@ Snapshot=openclonk-snapshot-(.*)-(.*)-{}-{}-."""
     def startClonk(self):
         try:
             while True:
+                if self.shutdowned:
+                    return
                 if self.scenario == "":
                     if self.queue.empty() == False:
                         self.scenario = self.queue.get()
@@ -315,7 +317,7 @@ Snapshot=openclonk-snapshot-(.*)-(.*)-{}-{}-."""
                     break
         
         finally:
-            if self.clonk:
+            if self.clonk and self.clonk.stdin and not self.clonk.stdin.closed:
                 self.clonk.stdin.close()
     
     def readServerOutput(self):
@@ -581,7 +583,6 @@ def quit(args):
     reply = args[0]
     if server.clonk and server.clonk.stdin:
         server.clonk.stdin.close()
-        server.server_thread.terminate()
         server.shutdown()
         sleep(5)
         raise SystemExit
-- 
cgit v1.2.3-54-g00ecf