Merge pull request #2105 from Capostrophic/colorpicker

[0.45.0 regression] Editor: Fix color picker oddities

apps/opencs/view/widget/coloreditor.cpp

@@ -82,6 +82,7 @@ void CSVWidget::ColorEditor::setColor(const int colorInt)
 void CSVWidget::ColorEditor::showPicker()
 {
     mColorPicker->showPicker(calculatePopupPosition(), mColor);
+    emit pickingFinished();
 }
 
 void CSVWidget::ColorEditor::pickerColorChanged(const QColor &color)

apps/opencs/view/widget/colorpickerpopup.cpp

@@ -39,7 +39,8 @@ void CSVWidget::ColorPickerPopup::showPicker(const QPoint &position, const QColo
 
     // Calling getColor() creates a blocking dialog that will continue execution once the user chooses OK or Cancel
     QColor color = mColorPicker->getColor(initialColor);
-    mColorPicker->setCurrentColor(color);
+    if (color.isValid())
+        mColorPicker->setCurrentColor(color);
 }
 
 void CSVWidget::ColorPickerPopup::mousePressEvent(QMouseEvent *event)