[qet] [1899] Fixed a bug when comparing two ConductorProperties objects.

[subversion@xxxxxxxxxxxxx]

Revision: 1899
Author:   xavier
Date:     2012-07-07 21:45:29 +0200 (Sat, 07 Jul 2012)
Log Message:
-----------
Fixed a bug when comparing two ConductorProperties objects.

Modified Paths:
--------------
    trunk/sources/conductorproperties.cpp

Modified: trunk/sources/conductorproperties.cpp
===================================================================
--- trunk/sources/conductorproperties.cpp	2012-07-05 15:00:45 UTC (rev 1898)
+++ trunk/sources/conductorproperties.cpp	2012-07-07 19:45:29 UTC (rev 1899)
@@ -313,7 +313,7 @@
 	return(
 		other.type == type &&\
 		other.color == color &&\
-		other.color == style &&\
+		other.style == style &&\
 		other.text == text &&\
 		other.singleLineProperties == singleLineProperties
 	);
@@ -327,7 +327,7 @@
 	return(
 		other.type != type ||\
 		other.color != color ||\
-		other.color != style ||\
+		other.style != style ||\
 		other.text != text ||\
 		other.singleLineProperties != singleLineProperties
 	);