Merge branch 'main' into CURA-9221_show_message_cloud_approval

This commit is contained in:
joeydelarago 2022-08-24 16:15:24 +02:00
commit 9b20a1b37f
26 changed files with 639 additions and 172 deletions

View file

@ -400,11 +400,13 @@ class CloudOutputDeviceManager:
# We do not use use MachineManager.addMachine here because we need to set the cluster ID before activating it.
new_machine = CuraStackBuilder.createMachine(device.name, device.printerType, show_warning_message=False)
if not new_machine:
Logger.log("e", "Failed creating a new machine")
Logger.error(f"Failed creating a new machine for {device.name}")
return False
self._setOutputDeviceMetadata(device, new_machine)
_abstract_machine = CuraStackBuilder.createAbstractMachine(device.printerType)
if activate:
CuraApplication.getInstance().getMachineManager().setActiveMachine(new_machine.getId())