Make sure that we don't cancel dialog

553f99db · Laurent Montel · 0519ad90 · 553f99db
Commit 553f99db authored Jul 14, 2021 by Laurent Montel 😁
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 8 deletions

src/contact-editor/editor/widgets/imagewidget.cpp src/contact-editor/editor/widgets/imagewidget.cpp +11 -8

No files found.
--- a/src/contact-editor/editor/widgets/imagewidget.cpp
+++ b/src/contact-editor/editor/widgets/imagewidget.cpp
@@ -267,14 +267,17 @@ void ImageWidget::changeUrl()
    if (mReadOnly) {
        return;
    }
-    const QString path = QInputDialog::getText(this, i18n("Change image URL"), i18n("Image URL:"), QLineEdit::Normal, mPicture.url());
-    if (!path.isEmpty()) {
-        bool ok;
-        const QImage image = imageLoader()->loadImage(QUrl(path), &ok, false);
-        if (ok && !image.isNull()) {
-            mPicture.setUrl(path);
-            mHasImage = true;
-            updateView();
+    bool okPath = false;
+    const QString path = QInputDialog::getText(this, i18n("Change image URL"), i18n("Image URL:"), QLineEdit::Normal, mPicture.url(), &okPath);
+    if (okPath) {
+        if (!path.isEmpty()) {
+            bool ok;
+            const QImage image = imageLoader()->loadImage(QUrl(path), &ok, false);
+            if (ok && !image.isNull()) {
+                mPicture.setUrl(path);
+                mHasImage = true;
+                updateView();
+            }
        }
    }
 }