From 4c00a8ff2cb8ea2bae15bd9246ac96870c8478a8 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Fri, 14 Aug 2020 13:57:09 +0200
Subject: [PATCH] Add extra short-circuit for resolve

---
 cura/Settings/GlobalStack.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cura/Settings/GlobalStack.py b/cura/Settings/GlobalStack.py
index a254104c5b..4528fd2302 100755
--- a/cura/Settings/GlobalStack.py
+++ b/cura/Settings/GlobalStack.py
@@ -263,6 +263,10 @@ class GlobalStack(CuraContainerStack):
             # Do not try to resolve anything but the "value" property
             return False
 
+        if not self.definition.getProperty(key, "resolve"):
+            # If there isn't a resolve set for this setting, there isn't anything to do here.
+            return False
+
         current_thread = threading.current_thread()
         if key in self._resolving_settings[current_thread.name]:
             # To prevent infinite recursion, if getProperty is called with the same key as