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

Merge branch 'CURA-7248_fix_misp_config_detection' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2020-07-02 16:37:53 +02:00
commit 21e28089a8
No known key found for this signature in database
GPG key ID: 3710727397403C91
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cura/PrinterOutput/Models/ExtruderConfigurationModel.py
View file

@ -74,11 +74,11 @@ class ExtruderConfigurationModel(QObject):
# Empty materials should be ignored for comparison
if self.activeMaterial is not None and other.activeMaterial is not None:
if self.activeMaterial.guid != other.activeMaterial.guid:
if self.activeMaterial.guid != "" and other.activeMaterial.guid != "":
return False
else:
if self.activeMaterial.guid == "" and other.activeMaterial.guid == "":
# At this point there is no material, so it doesn't matter what the hotend is.
return True
else:
return False
if self.hotendID != other.hotendID:
return False