Merge branch '3.4'

This commit is contained in:
Ghostkeeper 2018-06-06 16:58:01 +02:00
commit c42b275c5d
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
51 changed files with 18836 additions and 15903 deletions

View file

@ -1315,8 +1315,8 @@ class MachineManager(QObject):
# Check if the connect_group_name is correct. If not, update all the containers connected to the same printer
if self.activeMachineNetworkGroupName != group_name:
metadata_filter = {"um_network_key": self.activeMachineNetworkKey}
hidden_containers = ContainerRegistry.getInstance().findContainerStacks(type = "machine", **metadata_filter)
for container in hidden_containers:
containers = ContainerRegistry.getInstance().findContainerStacks(type = "machine", **metadata_filter)
for container in containers:
container.setMetaDataEntry("connect_group_name", group_name)
## This method checks if there is an instance connected to the given network_key