GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 14:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

CURA-5157 prevent some startup crash after upgrading from 2.7

Browse Source
This commit is contained in:
Jack Ha 2018-03-27 14:08:12 +02:00
parent 80676d80ba
commit ca4cb419ff
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cura/Settings/MachineManager.py
View File

@ -231,10 +231,12 @@ class MachineManager(QObject):
extruder_stack.containersChanged.disconnect(self._onInstanceContainersChanged) extruder_stack.containersChanged.disconnect(self._onInstanceContainersChanged)
# Update the local global container stack reference # Update the local global container stack reference
old_global_container_stack = self._global_container_stack
self._global_container_stack = Application.getInstance().getGlobalContainerStack() self._global_container_stack = Application.getInstance().getGlobalContainerStack()
if self._global_container_stack: if self._global_container_stack:
self.updateDefaultExtruder() self.updateDefaultExtruder()
self.updateNumberExtrudersEnabled() self.updateNumberExtrudersEnabled()
if old_global_container_stack != self._global_container_stack:
self.globalContainerChanged.emit() self.globalContainerChanged.emit()
# after switching the global stack we reconnect all the signals and set the variant and material references # after switching the global stack we reconnect all the signals and set the variant and material references
@ -1316,6 +1318,8 @@ class MachineManager(QObject):
return name return name
def _updateUponMaterialMetadataChange(self): def _updateUponMaterialMetadataChange(self):
if self._global_container_stack is None:
return
with postponeSignals(*self._getContainerChangedSignals(), compress = CompressTechnique.CompressPerParameterValue): with postponeSignals(*self._getContainerChangedSignals(), compress = CompressTechnique.CompressPerParameterValue):
self._updateMaterialWithVariant(None) self._updateMaterialWithVariant(None)
self._updateQualityWithMaterial() self._updateQualityWithMaterial()