3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 13:03:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Don't create a context when it's not provided

Browse source 
The rest of the functions already assume that None is an empty context
This commit is contained in:
Jaime van Kessel 2020-08-14 14:02:59 +02:00
parent 4c00a8ff2c
commit 51737dccd6
No known key found for this signature in database
GPG key ID: 3710727397403C91
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cura/Settings/GlobalStack.py
View file

@ -192,7 +192,7 @@ class GlobalStack(CuraContainerStack):
self._extruders[position] = extruder
self.extrudersChanged.emit()
Logger.log("i", "Extruder[%s] added to [%s] at position [%s]", extruder.id, self.id, position)
@override(ContainerStack)
def getProperty(self, key: str, property_name: str, context: Optional[PropertyEvaluationContext] = None) -> Any:
"""Overridden from ContainerStack
@ -211,9 +211,8 @@ class GlobalStack(CuraContainerStack):
if not self.definition.findDefinitions(key = key):
return None
if context is None:
context = PropertyEvaluationContext()
context.pushContainer(self)
if context:
context.pushContainer(self)
# Handle the "resolve" property.
#TODO: Why the hell does this involve threading?
@ -238,13 +237,15 @@ class GlobalStack(CuraContainerStack):
if super().getProperty(key, "settable_per_extruder", context):
result = self._extruders[str(limit_to_extruder)].getProperty(key, property_name, context)
if result is not None:
context.popContainer()
if context:
context.popContainer()
return result
else:
Logger.log("e", "Setting {setting} has limit_to_extruder but is not settable per extruder!", setting = key)
result = super().getProperty(key, property_name, context)
context.popContainer()
if context:
context.popContainer()
return result
@override(ContainerStack)