Fixed bug relate to pressing cancel in the color picker.

meter.cpp

@@ -236,7 +236,7 @@ void meter::paintEvent(QPaintEvent *)
 
 void meter::drawLabel(QPainter *qp)
 {
-    qp->setPen(lowLineColor);
+    qp->setPen(lowTextColor);
     qp->drawText(0,scaleTextYstart, label );
 }
 

wfmain.cpp

@@ -6275,7 +6275,10 @@ QColor wfmain::getColorFromPicker(QColor initialColor)
     options.setFlag(QColorDialog::ShowAlphaChannel, true);
     options.setFlag(QColorDialog::DontUseNativeDialog, true);
     QColor selColor = QColorDialog::getColor(initialColor, this, "Select Color", options);
-    return selColor;
+    if(selColor.isValid())
+        return selColor;
+    else
+        return initialColor;
 }
 
 void wfmain::getSetColor(QLedLabel *led, QLabel *label)