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

diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py
index 80ce9f0d3c17d23473ad111d2e06b7f81c0e7b8e..ddb07bad6eb60fc571c44ca833fe599a9d1769f2 100644 (file)
--- 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 94d1b778576c60db450a92c6310a40fa552e5263..7b264258464ef8c659204db64161c8a10f14909f 100644 (file)
--- 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):