From: daid <daid303@gmail.com>
Date: Tue, 25 Jun 2013 08:29:29 +0000 (+0200)
Subject: Fix the first-time-run wizard. Fix the commandline slicing #462
X-Git-Tag: 13.06.4~7
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ee9fc539c6186319e04219861edfe450453cb511;p=cura.git

Fix the first-time-run wizard. Fix the commandline slicing #462
---

diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py
index 80ce9f0d..ddb07bad 100644
--- a/Cura/gui/configWizard.py
+++ b/Cura/gui/configWizard.py
@@ -437,6 +437,7 @@ class UltimakerCheckupPage(InfoPage):
 		self.tempState.SetBitmap(self.unknownBitmap)
 		self.stopState.SetBitmap(self.unknownBitmap)
 		self.checkupState = 0
+		self.checkExtruderNr = 0
 		self.comm = machineCom.MachineCom(callbackObject=self)
 
 	def OnErrorLog(self, e):
diff --git a/Cura/util/sliceEngine.py b/Cura/util/sliceEngine.py
index 94d1b778..7b264258 100644
--- a/Cura/util/sliceEngine.py
+++ b/Cura/util/sliceEngine.py
@@ -66,7 +66,7 @@ class Slicer(object):
 		self._thread = None
 
 	def wait(self):
-		if self._process is not None:
+		if self._thread is not None:
 			self._thread.join()
 
 	def getGCodeFilename(self):