diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-08-23 10:27:45 +0200 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-08-23 17:52:36 +0000 |
| commit | f1808e96c5c45c95e6852481fe1ff71bda108811 (patch) | |
| tree | bde47d34ab278d7cc26f4d5c514eba0cb252d786 /src/widgets/dialogs | |
| parent | 680ec54a76eaf63375f648819ac9f98c915e5c43 (diff) | |
Fix crash for dereferencing zero
Some targets do not support QFileSystemWatcher causing
QFileSystemModel::iconProvider() to return zero.
Change-Id: I3d2b7034b9fb805237c66a7dcea4457bfa41d46d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/widgets/dialogs')
| -rw-r--r-- | src/widgets/dialogs/qsidebar.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qsidebar.cpp b/src/widgets/dialogs/qsidebar.cpp index bb61135cbc..3534588c56 100644 --- a/src/widgets/dialogs/qsidebar.cpp +++ b/src/widgets/dialogs/qsidebar.cpp @@ -192,7 +192,9 @@ void QUrlModel::setUrl(const QModelIndex &index, const QUrl &url, const QModelIn QIcon newIcon = qvariant_cast<QIcon>(dirIndex.data(Qt::DecorationRole)); if (!dirIndex.isValid()) { - newIcon = fileSystemModel->iconProvider()->icon(QFileIconProvider::Folder); + const QFileIconProvider *provider = fileSystemModel->iconProvider(); + if (provider) + newIcon = provider->icon(QFileIconProvider::Folder); newName = QFileInfo(url.toLocalFile()).fileName(); if (!invalidUrls.contains(url)) invalidUrls.append(url); |