Followup 8a0e1ef

nyalldawson · nyalldawson · commit 1b997802b56a · 2014-10-07T22:02:15.000+11:00
diff --git a/src/gui/qgscolorswatchgrid.cpp b/src/gui/qgscolorswatchgrid.cpp
@@ -308,7 +308,7 @@ void QgsColorSwatchGrid::draw( QPainter &painter )
     {
       painter.setPen( highlight );
     }
-    else if (( *colorIt ).first == mBaseColor )
+    else if (( *colorIt ).first.name() == mBaseColor.name() )
     {
       //currently active color
       painter.setPen( QColor( 75, 75, 75 ) );

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ void QgsColorSwatchGrid::draw( QPainter &painter )`
`308`	`308`	`{`
`309`	`309`	`painter.setPen( highlight );`
`310`	`310`	`}`
`311`		`- else if (( *colorIt ).first == mBaseColor )`
	`311`	`+ else if (( *colorIt ).first.name() == mBaseColor.name() )`
`312`	`312`	`{`
`313`	`313`	`//currently active color`
`314`	`314`	`painter.setPen( QColor( 75, 75, 75 ) );`