From 6c0aa0fa4fec43717910f2e9bc0962bab2b65762 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 25 Aug 2016 10:49:35 +0200 Subject: [PATCH] Tweaks to slicing engine restart behavior CURA-2158 --- plugins/CuraEngineBackend/CuraEngineBackend.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 8b2fe6d01d..2d8de12b7b 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -194,8 +194,7 @@ class CuraEngineBackend(Backend): self.slicingCancelled.emit() self.processingProgress.emit(0) Logger.log("d", "Attempting to kill the engine process") - if self._enabled: - self._createSocket() # Ensure that we have a fresh socket. + if Application.getInstance().getCommandLineOption("external-backend", False): return @@ -409,9 +408,11 @@ class CuraEngineBackend(Backend): # # We should reset our state and start listening for new connections. def _onBackendQuit(self): - if not self._restart and self._process: - Logger.log("d", "Backend quit with return code %s. Resetting process and socket.", self._process.wait()) - self._process = None + if not self._restart: + if self._process: + Logger.log("d", "Backend quit with return code %s. Resetting process and socket.", self._process.wait()) + self._process = None + self._createSocket() ## Called when the global container stack changes def _onGlobalStackChanged(self):