3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'master' into feature_preheat_extruder

Browse source 
# Conflicts:
#	plugins/USBPrinting/USBPrinterOutputController.py
#	plugins/USBPrinting/USBPrinterOutputDevice.py
This commit is contained in:
fieldOfView 2018-01-27 16:35:55 +01:00
commit ed9943c732
114 changed files with 3794 additions and 3108 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py
View file

@ -287,7 +287,11 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
self._updatePrintJob(print_job, print_job_data)
if print_job.state != "queued": # Print job should be assigned to a printer.
printer = self._getPrinterByKey(print_job_data["printer_uuid"])
if print_job.state == "failed":
# Print job was failed, so don't attach it to a printer.
printer = None
else:
printer = self._getPrinterByKey(print_job_data["printer_uuid"])
else: # The job can "reserve" a printer if some changes are required.
printer = self._getPrinterByKey(print_job_data["assigned_to"])