From d85aee1c53cb27983f73d153685a1681efa78b58 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Mon, 26 Nov 2018 16:40:29 +0100
Subject: [PATCH] Ensure that no weird data is set in the printSetupSelector on
 first start

CURA-5961
---
 resources/qml/PrintSetupSelector.qml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/qml/PrintSetupSelector.qml b/resources/qml/PrintSetupSelector.qml
index 2ecdc9e546..9b90d8589f 100644
--- a/resources/qml/PrintSetupSelector.qml
+++ b/resources/qml/PrintSetupSelector.qml
@@ -54,12 +54,12 @@ Cura.ExpandableComponent
         IconWithText
         {
             source: UM.Theme.getIcon("category_layer_height")
-            text: Cura.MachineManager.activeQualityOrQualityChangesName + " " + layerHeight.properties.value + "mm"
+            text: Cura.MachineManager.activeStack ? Cura.MachineManager.activeQualityOrQualityChangesName + " " + layerHeight.properties.value + "mm" : ""
 
             UM.SettingPropertyProvider
             {
                 id: layerHeight
-                containerStackId: Cura.MachineManager.activeStackId
+                containerStack: Cura.MachineManager.activeStack
                 key: "layer_height"
                 watchedProperties: ["value"]
             }
@@ -68,12 +68,12 @@ Cura.ExpandableComponent
         IconWithText
         {
             source: UM.Theme.getIcon("category_infill")
-            text: parseInt(infillDensity.properties.value) + "%"
+            text: Cura.MachineManager.activeStack ? parseInt(infillDensity.properties.value) + "%" : "0%"
 
             UM.SettingPropertyProvider
             {
                 id: infillDensity
-                containerStackId: Cura.MachineManager.activeStackId
+                containerStack: Cura.MachineManager.activeStack
                 key: "infill_sparse_density"
                 watchedProperties: ["value"]
             }