3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 15:07:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Prevent crash in model if no extruder is set

Browse source 
CURA-6598
This commit is contained in:
Jaime van Kessel 2019-08-29 11:57:03 +02:00
parent b56c09bcf4
commit f4dc93fc39
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Machines/Models/BaseMaterialsModel.py
View file

@ -103,6 +103,8 @@ class BaseMaterialsModel(ListModel):
# tree. This change may trigger an _update() call when the materials # tree. This change may trigger an _update() call when the materials
# changed for the configuration that this model is looking for. # changed for the configuration that this model is looking for.
def _materialsListChanged(self, material: MaterialNode) -> None: def _materialsListChanged(self, material: MaterialNode) -> None:
if self._extruder_stack is None:
return
if material.variant.container_id != self._extruder_stack.variant.getId(): if material.variant.container_id != self._extruder_stack.variant.getId():
return return
if material.variant.machine.container_id != cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack().definition.getId(): if material.variant.machine.container_id != cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack().definition.getId():

3
resources/qml/Settings/SettingComboBox.qml
View file

@ -20,8 +20,7 @@ SettingItem
textRole: "value" textRole: "value"
anchors.fill: parent anchors.fill: parent
highlighted: base.hovered
onActivated: onActivated:
{ {
forceActiveFocus() forceActiveFocus()