From 007add7fc2dbf70e7a0070d731bbe43a481f52a3 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Tue, 29 Oct 2019 10:55:47 +0100
Subject: [PATCH] Prevent undefined qml warnings

CURA-6935
---
 resources/qml/Settings/SettingExtruder.qml | 2 +-
 resources/qml/Settings/SettingItem.qml     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml
index 7162744ae5..ff57381ddf 100644
--- a/resources/qml/Settings/SettingExtruder.qml
+++ b/resources/qml/Settings/SettingExtruder.qml
@@ -75,7 +75,7 @@ SettingItem
             base.setActiveFocusToNextSetting(false)
         }
 
-        currentIndex: propertyProvider.properties.value
+        currentIndex: propertyProvider.properties.value !== undefined ? propertyProvider.properties.value : 0
 
         property string color: "#fff"
 
diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml
index e1b3f5a098..9986c7eaf8 100644
--- a/resources/qml/Settings/SettingItem.qml
+++ b/resources/qml/Settings/SettingItem.qml
@@ -277,6 +277,10 @@ Item
                         // Observed when loading workspace, probably when SettingItems are removed.
                         return false
                     }
+                    if(globalPropertyProvider.properties.limit_to_extruder === undefined)
+                    {
+                        return false
+                    }
                     return Cura.SettingInheritanceManager.getOverridesForExtruder(definition.key, String(globalPropertyProvider.properties.limit_to_extruder)).indexOf(definition.key) >= 0
                 }