Merge branch 'master' into CURA-4333_Notification_icon_for_recommended_mode

This commit is contained in:
Lipu Fei 2017-10-16 11:37:55 +02:00
commit 94a624e105
20 changed files with 293 additions and 46 deletions

View file

@ -1135,7 +1135,7 @@ class MachineManager(QObject):
machine_stacks = ContainerRegistry.getInstance().findContainerStacks(type = "machine")
other_machine_stacks = [s for s in machine_stacks if s.getId() != machine_id]
if other_machine_stacks:
Application.getInstance().setGlobalContainerStack(other_machine_stacks[0])
self.setActiveMachine(other_machine_stacks[0].getId())
ExtruderManager.getInstance().removeMachineExtruders(machine_id)
containers = ContainerRegistry.getInstance().findInstanceContainers(type = "user", machine = machine_id)