From 9ffadb369dd6b61ece3323592bb96a3955728d61 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Thu, 2 Jul 2020 15:44:22 +0200 Subject: [PATCH] Fix ExtruderConfigurationModel.__eq__ Fixes an issue where 2 configurations (empty, empty) and (pla, empty) were considered equal CURA-7248 --- cura/PrinterOutput/Models/ExtruderConfigurationModel.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/PrinterOutput/Models/ExtruderConfigurationModel.py b/cura/PrinterOutput/Models/ExtruderConfigurationModel.py index ecc855ab8f..4fbf951f45 100644 --- a/cura/PrinterOutput/Models/ExtruderConfigurationModel.py +++ b/cura/PrinterOutput/Models/ExtruderConfigurationModel.py @@ -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