3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-29 05:41:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Handle the case that resolve is undefined

Browse source 
CURA-6490
This commit is contained in:
Lipu Fei 2019-05-27 13:40:37 +02:00
parent 9793fc16a3
commit a14eb50fec
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Settings/SettingCheckBox.qml
View file

@ -29,7 +29,7 @@ SettingItem
// 4: variant // 4: variant
// 5: machine // 5: machine
var value var value
if ((base.resolve != "None") && (stackLevel != 0) && (stackLevel != 1)) if ((base.resolve !== undefined && base.resolve != "None") && (stackLevel != 0) && (stackLevel != 1))
{ {
// We have a resolve function. Indicates that the setting is not settable per extruder and that // We have a resolve function. Indicates that the setting is not settable per extruder and that
// we have to choose between the resolved value (default) and the global value // we have to choose between the resolved value (default) and the global value

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

@ -54,7 +54,7 @@ SettingItem
{ {
// FIXME this needs to go away once 'resolve' is combined with 'value' in our data model. // FIXME this needs to go away once 'resolve' is combined with 'value' in our data model.
var value = undefined var value = undefined
if ((base.resolve != "None") && (base.stackLevel != 0) && (base.stackLevel != 1)) if ((base.resolve !== undefined && base.resolve != "None") && (base.stackLevel != 0) && (base.stackLevel != 1))
{ {
// We have a resolve function. Indicates that the setting is not settable per extruder and that // We have a resolve function. Indicates that the setting is not settable per extruder and that
// we have to choose between the resolved value (default) and the global value // we have to choose between the resolved value (default) and the global value