fix color dialog not open in Open Other > Color or Text

mltframework · Sep 1, 2020 · c4a530b · c4a530b
1 parent 0c9ff0f
commit c4a530b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/src/widgets/colorproducerwidget.cpp b/src/widgets/colorproducerwidget.cpp
@@ -60,10 +60,10 @@ ColorProducerWidget::~ColorProducerWidget()
 
 void ColorProducerWidget::on_colorButton_clicked()
 {
-    if (!m_producer) {
-        return;
+    QColor color = colorStringToResource(ui->colorLabel->text());
+    if (m_producer) {
+        color = QColor(QFileInfo(m_producer->get("resource")).baseName());
     }
-    QColor color(QFileInfo(m_producer->get("resource")).baseName());
     QColorDialog dialog(color);
     dialog.setOption(QColorDialog::ShowAlphaChannel);
     if (dialog.exec() == QDialog::Accepted) {
@@ -75,10 +75,12 @@ void ColorProducerWidget::on_colorButton_clicked()
         ui->colorLabel->setStyleSheet(QString("color: %1; background-color: %2")
                                       .arg((newColor.value() < 150)? "white":"black")
                                       .arg(newColor.name()));
-        m_producer->set("resource", colorStringToResource(ui->colorLabel->text()).toLatin1().constData());
-        m_producer->set(kShotcutCaptionProperty, ui->colorLabel->text().toLatin1().constData());
-        m_producer->set(kShotcutDetailProperty, ui->colorLabel->text().toLatin1().constData());
-        emit producerChanged(m_producer.data());
+        if (m_producer) {
+            m_producer->set("resource", colorStringToResource(ui->colorLabel->text()).toLatin1().constData());
+            m_producer->set(kShotcutCaptionProperty, ui->colorLabel->text().toLatin1().constData());
+            m_producer->set(kShotcutDetailProperty, ui->colorLabel->text().toLatin1().constData());
+            emit producerChanged(m_producer.data());
+        }
     }
 }
 

diff --git a/src/widgets/textproducerwidget.cpp b/src/widgets/textproducerwidget.cpp
@@ -61,10 +61,10 @@ TextProducerWidget::~TextProducerWidget()
 
 void TextProducerWidget::on_colorButton_clicked()
 {
-    if (!m_producer) {
-        return;
+    QColor color = colorStringToResource(ui->colorLabel->text());
+    if (m_producer) {
+        color = QColor(QFileInfo(m_producer->get("resource")).baseName());
     }
-    QColor color(QFileInfo(m_producer->get("resource")).baseName());
     QColorDialog dialog(color);
     dialog.setOption(QColorDialog::ShowAlphaChannel);
     if (dialog.exec() == QDialog::Accepted) {
@@ -76,10 +76,12 @@ void TextProducerWidget::on_colorButton_clicked()
         ui->colorLabel->setStyleSheet(QString("color: %1; background-color: %2")
                                       .arg((dialog.currentColor().value() < 150)? "white":"black")
                                       .arg(dialog.currentColor().name()));
-        m_producer->set("resource", colorStringToResource(ui->colorLabel->text()).toLatin1().constData());
-        m_producer->set(kShotcutCaptionProperty, ui->colorLabel->text().toLatin1().constData());
-        m_producer->set(kShotcutDetailProperty, ui->colorLabel->text().toLatin1().constData());
-        emit producerChanged(m_producer.data());
+        if (m_producer) {
+            m_producer->set("resource", colorStringToResource(ui->colorLabel->text()).toLatin1().constData());
+            m_producer->set(kShotcutCaptionProperty, ui->colorLabel->text().toLatin1().constData());
+            m_producer->set(kShotcutDetailProperty, ui->colorLabel->text().toLatin1().constData());
+            emit producerChanged(m_producer.data());
+        }
     }
 }