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

Fix ExtruderConfigurationModel.__eq__

Browse source 
Fixes an issue where 2 configurations
(empty, empty) and (pla, empty) were considered
equal

CURA-7248
This commit is contained in:
Nino van Hooff 2020-07-02 15:44:22 +02:00
parent 7a37803ae4
commit 9ffadb369d
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 # Empty materials should be ignored for comparison
if self.activeMaterial is not None and other.activeMaterial is not None: if self.activeMaterial is not None and other.activeMaterial is not None:
if self.activeMaterial.guid != other.activeMaterial.guid: if self.activeMaterial.guid != other.activeMaterial.guid:
if self.activeMaterial.guid != "" and other.activeMaterial.guid != "": if self.activeMaterial.guid == "" and other.activeMaterial.guid == "":
return False
else:
# At this point there is no material, so it doesn't matter what the hotend is. # At this point there is no material, so it doesn't matter what the hotend is.
return True return True
else:
return False
if self.hotendID != other.hotendID: if self.hotendID != other.hotendID:
return False return False