From f296b77d2c579994b38ed2b4b601048734ac1c10 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Mon, 22 Aug 2016 14:17:47 +0200
Subject: [PATCH] Fix check for presence of global_inherits_stack

My mistake.

Contributes to issue CURA-2006.
---
 resources/qml/Settings/SettingView.qml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index c5fec8c8ce..57cf8f4add 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -94,10 +94,7 @@ ScrollView
             {
                 target: provider
                 property: "containerStackId"
-                when: {
-                    var now = model.settable_per_extruder || model.settable_per_mesh || (inheritStackProvider.properties.global_inherits_stack == null && inheritStackProvider.properties.global_inherits_stack < 0);
-                    return now;
-                }
+                when: model.settable_per_extruder || model.settable_per_mesh || (inheritStackProvider.properties.global_inherits_stack != null && inheritStackProvider.properties.global_inherits_stack >= 0);
                 value:
                 {
                     if(!model.settable_per_extruder && !model.settable_per_mesh)