From c693ea13719ad393717b902e2653dd400e40cf97 Mon Sep 17 00:00:00 2001
From: xavier
 <xavier@r991  xavier  2010-05-09 20:40:08 +0200 (dim. 09 mai 2010)>
Date: Sat, 7 Jul 2012 19:45:29 +0000
Subject: [PATCH] Fixed a bug when comparing two ConductorProperties objects.

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@1899 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 sources/conductorproperties.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sources/conductorproperties.cpp b/sources/conductorproperties.cpp
index f2042d99f..2e5cfb462 100644
--- a/sources/conductorproperties.cpp
+++ b/sources/conductorproperties.cpp
@@ -313,7 +313,7 @@ int ConductorProperties::operator==(const ConductorProperties &other) {
 	return(
 		other.type == type &&\
 		other.color == color &&\
-		other.color == style &&\
+		other.style == style &&\
 		other.text == text &&\
 		other.singleLineProperties == singleLineProperties
 	);
@@ -327,7 +327,7 @@ int ConductorProperties::operator!=(const ConductorProperties &other) {
 	return(
 		other.type != type ||\
 		other.color != color ||\
-		other.color != style ||\
+		other.style != style ||\
 		other.text != text ||\
 		other.singleLineProperties != singleLineProperties
 	);