3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 15:07:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch '2.1'

Browse source 
Conflicts:
	plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py
	plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py
	plugins/USBPrinting/PrinterConnection.py
	resources/machines/fdmprinter.json
	resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
This commit is contained in:
Ghostkeeper 2016-03-17 15:24:00 +01:00
commit de9a66e1f4
47 changed files with 248 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/CuraEngineBackend/CuraEngineBackend.py
View file

@ -157,6 +157,7 @@ class CuraEngineBackend(Backend):
self._process = None
except: # terminating a process that is already terminating causes an exception, silently ignore this.
pass
Logger.log("d", "Engine process is killed")
def _onStartSliceCompleted(self, job):
if job.getError() or job.getResult() != True: