From 6647b001032f365a812ca4b11ed7b167b73076a0 Mon Sep 17 00:00:00 2001 From: daid Date: Sun, 2 Mar 2014 09:55:19 +0100 Subject: [PATCH] Fix possible race-condition. --- Cura/util/sliceEngine.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Cura/util/sliceEngine.py b/Cura/util/sliceEngine.py index 432038dd..e99e22dc 100644 --- a/Cura/util/sliceEngine.py +++ b/Cura/util/sliceEngine.py @@ -347,17 +347,17 @@ class Engine(object): self._objCount += 1 modelHash = hash.hexdigest() if self._objCount > 0: - self._modelData = engineModelData - self._thread = threading.Thread(target=self._watchProcess, args=(commandList, self._thread, modelHash)) + self._thread = threading.Thread(target=self._watchProcess, args=(commandList, self._thread, engineModelData, modelHash)) self._thread.daemon = True self._thread.start() - def _watchProcess(self, commandList, oldThread, modelHash): + def _watchProcess(self, commandList, oldThread, engineModelData, modelHash): if oldThread is not None: if self._process is not None: self._process.terminate() oldThread.join() self._callback(-1.0) + self._modelData = engineModelData try: self._process = self._runEngineProcess(commandList) except OSError: @@ -367,6 +367,7 @@ class Engine(object): self._process.terminate() self._result = EngineResult() + self._result.addLog('Running: %s' % (' '.join(commandList))) self._result.setHash(modelHash) self._callback(0.0) -- 2.30.2