Merge branch '2.6'

This commit is contained in:
Ghostkeeper 2017-06-15 09:54:19 +02:00
commit 66f5b236d6
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
6 changed files with 269 additions and 249 deletions

View file

@ -561,7 +561,7 @@ class ContainerManager(QObject):
global_stack = Application.getInstance().getGlobalContainerStack()
if not global_stack or not quality_name:
return ""
machine_definition = global_stack.getBottom()
machine_definition = QualityManager.getInstance().getParentMachineDefinition(global_stack.getBottom())
for container in QualityManager.getInstance().findQualityChangesByName(quality_name, machine_definition):
containers_found = True