3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-02 19:43:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix check for self._global_container_stack for consistency

Browse source 
CURA-340
This commit is contained in:
fieldOfView 2016-06-15 11:13:31 +02:00
parent 0864b53081
commit 2460b37c99
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cura/MachineManagerModel.py
View file

@ -446,7 +446,7 @@ class MachineManagerModel(QObject):
@pyqtProperty(str, notify = globalContainerChanged) @pyqtProperty(str, notify = globalContainerChanged)
def activeDefinitionId(self): def activeDefinitionId(self):
if self._active_container_stack: if self._global_container_stack:
definition = self._global_container_stack.getBottom() definition = self._global_container_stack.getBottom()
if definition: if definition:
return definition.id return definition.id
@ -480,14 +480,14 @@ class MachineManagerModel(QObject):
@pyqtProperty(bool, notify = globalContainerChanged) @pyqtProperty(bool, notify = globalContainerChanged)
def hasMaterials(self): def hasMaterials(self):
if self._active_container_stack: if self._global_container_stack:
return bool(self._global_container_stack.getMetaDataEntry("has_materials", False)) return bool(self._global_container_stack.getMetaDataEntry("has_materials", False))
return False return False
@pyqtProperty(bool, notify = globalContainerChanged) @pyqtProperty(bool, notify = globalContainerChanged)
def hasVariants(self): def hasVariants(self):
if self._active_container_stack: if self._global_container_stack:
return bool(self._global_container_stack.getMetaDataEntry("has_variants", False)) return bool(self._global_container_stack.getMetaDataEntry("has_variants", False))
return False return False