From f8e9945bc45746c418def6d07156b56579b85c07 Mon Sep 17 00:00:00 2001
From: arcan1s <i@arcanis.me>
Date: Wed, 20 Apr 2016 15:50:45 +0300
Subject: [PATCH] fix configuration dialog error

even if user selects Cancel in font dialog html codes pasted
---
 sources/3rdparty/fontdialog                           | 2 +-
 sources/awesome-widget/package/contents/ui/widget.qml | 5 +++++
 sources/awesome-widget/plugin/awactions.cpp           | 7 +++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/sources/3rdparty/fontdialog b/sources/3rdparty/fontdialog
index ef47b11..e7bcf8e 160000
--- a/sources/3rdparty/fontdialog
+++ b/sources/3rdparty/fontdialog
@@ -1 +1 @@
-Subproject commit ef47b1146e88caaa9be4f68d5b42919f36ab051c
+Subproject commit e7bcf8ee858e7be3012168e12c7b14ccc28535b4
diff --git a/sources/awesome-widget/package/contents/ui/widget.qml b/sources/awesome-widget/package/contents/ui/widget.qml
index d9c7c30..a5ce79b 100644
--- a/sources/awesome-widget/package/contents/ui/widget.qml
+++ b/sources/awesome-widget/package/contents/ui/widget.qml
@@ -73,6 +73,11 @@ Item {
                         "size": plasmoid.configuration.fontSize
                     }
                     var font = awActions.getFont(defaultFont)
+                    if (font.applied != 1) {
+                        if (debug) console.debug("No font selected")
+                        return
+                    }
+
                     var selected = textPattern.selectedText
                     textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
                     textPattern.insert(textPattern.cursorPosition,
diff --git a/sources/awesome-widget/plugin/awactions.cpp b/sources/awesome-widget/plugin/awactions.cpp
index 93efb56..d0281ca 100644
--- a/sources/awesome-widget/plugin/awactions.cpp
+++ b/sources/awesome-widget/plugin/awactions.cpp
@@ -154,11 +154,14 @@ QVariantMap AWActions::getFont(const QVariantMap defaultFont) const
     qCDebug(LOG_AW) << "Default font is" << defaultFont;
 
     QVariantMap fontMap;
+    int ret = 0;
     CFont defaultCFont = CFont(defaultFont[QString("family")].toString(),
                                defaultFont[QString("size")].toInt(), 400, false,
                                defaultFont[QString("color")].toString());
-    CFont font
-        = CFontDialog::getFont(i18n("Select font"), defaultCFont, false, false);
+    CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false,
+                                      false, &ret);
+
+    fontMap[QString("applied")] = ret;
     fontMap[QString("color")] = font.color().name();
     fontMap[QString("family")] = font.family();
     fontMap[QString("size")] = font.pointSize();