From d11ae30b1ac11c664a4655025ba2e518395a3b92 Mon Sep 17 00:00:00 2001
From: Elliott Liggett <kilocharlie8@gmail.com>
Date: Sun, 21 Aug 2022 23:50:02 -0700
Subject: [PATCH] Fixed bug relate to pressing cancel in the color picker.

---
 meter.cpp  | 2 +-
 wfmain.cpp | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meter.cpp b/meter.cpp
index 611c2e7..478f90a 100644
--- a/meter.cpp
+++ b/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 );
 }
 
diff --git a/wfmain.cpp b/wfmain.cpp
index 62c068f..ee1d68d 100644
--- a/wfmain.cpp
+++ b/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)