From: daid <daid303@gmail.com>
Date: Tue, 16 Dec 2014 09:54:12 +0000 (+0100)
Subject: Do not join the thread from the abortEngine function, as this is called from the... 
X-Git-Tag: 15.01-RC2~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a328913ca39f508e8f15719a53b3916bc56e8ff0;p=cura.git

Do not join the thread from the abortEngine function, as this is called from the GUI thread. Possibly fixing the issue bot is having on the UM forums.
---

diff --git a/Cura/util/sliceEngine.py b/Cura/util/sliceEngine.py
index 2678c69f..6425259e 100644
--- 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: