Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kamm <mail@ckamm.de>2017-05-22 15:15:53 +0300
committerChristian Kamm <mail@ckamm.de>2017-05-22 15:15:53 +0300
commit91f6cae168d5aa17d36f9403c2388cc25fa7fdaf (patch)
treeb62f1e8930da4f6e9832576c18c21a8fea4df8d9 /src/gui/sharedialog.cpp
parentddd584077c473c4bad3d23d0b80d988a2b9e5db0 (diff)
Share dialog: Use default icon if available #5781
Diffstat (limited to 'src/gui/sharedialog.cpp')
-rw-r--r--src/gui/sharedialog.cpp8
1 files changed, 6 insertions, 2 deletions
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)));