Merge branch '4.0'

This commit is contained in:
Ghostkeeper 2019-03-06 15:23:55 +01:00
commit 1d25f52df6
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
10 changed files with 65 additions and 26 deletions

View file

@ -357,7 +357,7 @@ class MachineManager(QObject):
# Make sure that the default machine actions for this machine have been added
self._application.getMachineActionManager().addDefaultMachineActions(global_stack)
ExtruderManager.getInstance()._fixSingleExtrusionMachineExtruderDefinition(global_stack)
ExtruderManager.getInstance().fixSingleExtrusionMachineExtruderDefinition(global_stack)
if not global_stack.isValid():
# Mark global stack as invalid
ConfigurationErrorMessage.getInstance().addFaultyContainers(global_stack.getId())