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

cura/CuraApplication.py

@@ -321,6 +321,7 @@ class CuraApplication(QtApplication):
                                  MachineManagerModel.createMachineManagerModel)
 
         self.setMainQml(Resources.getPath(self.ResourceTypes.QmlFiles, "Cura.qml"))
+        self._qml_import_paths.append(Resources.getPath(self.ResourceTypes.QmlFiles))
         self.initializeEngine()
 
         if self._engine.rootObjects:

cura/MachineManagerModel.py

@@ -266,6 +266,11 @@ class MachineManagerModel(QObject):
 
     @pyqtSlot(str)
     def removeMachine(self, machine_id):
+        # If the machine that is being removed is the currently active machine, set another machine as the active machine
+        if self._global_container_stack and self._global_container_stack.getId() == machine_id:
+            containers = UM.Settings.ContainerRegistry.getInstance().findContainerStacks()
+            if containers:
+                Application.getInstance().setGlobalContainerStack(containers[0])
         UM.Settings.ContainerRegistry.getInstance().removeContainer(machine_id)
 
     @pyqtProperty(bool, notify = globalContainerChanged)

cura/SettingOverrideDecorator.py

@@ -14,8 +14,8 @@ from UM.Application import Application
 class SettingOverrideDecorator(SceneNodeDecorator):
     def __init__(self):
         super().__init__()
-        self._stack = ContainerStack(id = "SettingOverrideStack")
-        self._instance = InstanceContainer(id = "SettingOverrideInstanceContainer")
+        self._stack = ContainerStack(stack_id = "SettingOverrideStack")
+        self._instance = InstanceContainer(container_id = "SettingOverrideInstanceContainer")
         self._stack.addContainer(self._instance)
 
         Application.getInstance().globalContainerStackChanged.connect(self._onGlobalContainerStackChanged)