Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2017-05-09 14:02:09 +02:00
commit 6493bcd5b5
2 changed files with 163 additions and 38 deletions

View file

@ -351,7 +351,9 @@ class MachineManager(QObject):
def addMachine(self, name: str, definition_id: str) -> None:
new_stack = CuraStackBuilder.createMachine(name, definition_id)
if new_stack:
Application.getInstance().setGlobalContainerStack(new_stack)
# only set the global container stack if there was none
if self._global_container_stack is None:
Application.getInstance().setGlobalContainerStack(new_stack)
else:
Logger.log("w", "Failed creating a new machine!")