Merge branch '4.4'

Conflicts:
	cura/Machines/MaterialNode.py -> Due to some automated formatting tool. Please disable those tools, people.
This commit is contained in:
Ghostkeeper 2019-12-23 16:26:25 +01:00
commit 8a9b791298
No known key found for this signature in database
GPG key ID: 37E2020986774393
5 changed files with 78 additions and 9 deletions

View file

@ -894,8 +894,8 @@ class MachineManager(QObject):
@pyqtSlot(int, bool)
def setExtruderEnabled(self, position: int, enabled: bool) -> None:
if self._global_container_stack is None:
Logger.log("w", "Could not find extruder on position %s", position)
if self._global_container_stack is None or str(position) not in self._global_container_stack.extruders:
Logger.log("w", "Could not find extruder on position %s.", position)
return
extruder = self._global_container_stack.extruderList[position]