From: Christian Kamm <mail@ckamm.de>
Date: Mon, 22 May 2017 12:15:53 +0000 (+0200)
Subject: Share dialog: Use default icon if available #5781
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~713
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=91f6cae168d5aa17d36f9403c2388cc25fa7fdaf;p=nextcloud-desktop.git

Share dialog: Use default icon if available #5781
---

diff --git a/src/gui/sharedialog.cpp b/src/gui/sharedialog.cpp
index d5cb5b30f..17399d1a4 100644
--- a/src/gui/sharedialog.cpp
+++ b/src/gui/sharedialog.cpp
@@ -69,7 +69,12 @@ ShareDialog::ShareDialog(QPointer<AccountState> accountState,
     QFileInfo f_info(_localPath);
     QFileIconProvider icon_provider;
     QIcon icon = icon_provider.icon(f_info);
-    _ui->label_icon->setPixmap(icon.pixmap(thumbnailSize, thumbnailSize));
+    auto pixmap = icon.pixmap(thumbnailSize, thumbnailSize);
+    if (pixmap.width() > 0) {
+        _ui->label_icon->setPixmap(pixmap);
+    } else {
+        _ui->label_icon->hide();
+    }
 
     // Set filename
     QFileInfo lPath(_localPath);
@@ -109,7 +114,6 @@ ShareDialog::ShareDialog(QPointer<AccountState> accountState,
         return;
     }
 
-    _ui->label_icon->hide();
     if (QFileInfo(_localPath).isFile()) {
         ThumbnailJob *job = new ThumbnailJob(_sharePath, _accountState->account(), this);
         connect(job, SIGNAL(jobFinished(int, QByteArray)), SLOT(slotThumbnailFetched(int, QByteArray)));