Merge tag '15.01-RC2' into upstream

[cura.git] / Cura / util / sliceEngine.py

diff --git a/Cura/util/sliceEngine.py b/Cura/util/sliceEngine.py
index e19b1a7413ee630b5c6b0182a96227fe0c27267f..73d018941615aee7eb1b6ceeceba8a82823fa2cd 100644 (file)
--- a/Cura/util/sliceEngine.py
+++ b/Cura/util/sliceEngine.py
@@ -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: