GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 07:44:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Partial fix for infinite recursion when trying to call getProperty

Browse Source
This commit is contained in:
Arjen Hiemstra 2017-04-04 17:41:21 +02:00
parent 82333a244b
commit a16b5d73b6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cura/Settings/GlobalStack.py
View File

@ -23,6 +23,8 @@ class GlobalStack(CuraContainerStack):
self._extruders = [] self._extruders = []
self._resolving_property = None
@pyqtProperty("QVariantList") @pyqtProperty("QVariantList")
def extruders(self) -> list: def extruders(self) -> list:
return self._extruders return self._extruders
@ -37,8 +39,9 @@ class GlobalStack(CuraContainerStack):
## Overridden from ContainerStack ## Overridden from ContainerStack
@override(ContainerStack) @override(ContainerStack)
def getProperty(self, key: str, property_name: str) -> Any: def getProperty(self, key: str, property_name: str) -> Any:
if property_name == "value": if property_name == "value" and not self._resolving_property:
if not self.hasUserValue(key): if not self.hasUserValue(key):
self._resolving_property = key
resolve = super().getProperty(key, "resolve") resolve = super().getProperty(key, "resolve")
if resolve: if resolve:
return resolve return resolve