chiark / gitweb /
Do not join the thread from the abortEngine function, as this is called from the...
authordaid <daid303@gmail.com>
Tue, 16 Dec 2014 09:54:12 +0000 (10:54 +0100)
committerdaid <daid303@gmail.com>
Tue, 16 Dec 2014 09:54:12 +0000 (10:54 +0100)
Cura/util/sliceEngine.py

index 2678c69f831bf8eaf33f242a5e7f2d35a4e3aa4d..6425259eef98c7ab05cfa057380d971dfb07a763 100644 (file)
@@ -265,6 +265,7 @@ class Engine(object):
 
        def cleanup(self):
                self.abortEngine()
+               self.wait()
                self._serversocket.close()
 
        def abortEngine(self):
@@ -273,9 +274,6 @@ class Engine(object):
                                self._process.terminate()
                        except:
                                pass
-               if self._thread is not None:
-                       self._thread.join()
-               self._thread = None
 
        def wait(self):
                if self._thread is not None: