From a740120fe157ab2ceb168b90d57204784e606309 Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Mon, 24 Sep 2012 22:59:59 +0200 Subject: Fix crash when receiving Nepomuk info for a recently deleted file. BUG: 306036 FIXED-IN: 4.9.2 --- src/kitemviews/kfileitemmodelrolesupdater.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/kitemviews/kfileitemmodelrolesupdater.cpp') diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp index 6dba2245d..f3d4c0e76 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.cpp +++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp @@ -595,6 +595,13 @@ void KFileItemModelRolesUpdater::applyChangedNepomukRoles(const Nepomuk::Resourc #ifdef HAVE_NEPOMUK const KUrl itemUrl = m_nepomukUriItems.value(resource.resourceUri()); const KFileItem item = m_model->fileItem(itemUrl); + + if (item.isNull()) { + // itemUrl is not in the model anymore, probably because + // the corresponding file has been deleted in the meantime. + return; + } + QHash data = rolesData(item); const KNepomukRolesProvider& rolesProvider = KNepomukRolesProvider::instance(); -- cgit v1.3.1 From 63561edb4598035e8631575dbc19d0581e85823a Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Wed, 26 Sep 2012 17:36:51 +0200 Subject: Fix a Bug in KFileItemModelRolesUpdate::setEnabledPlugins. Changes were never overtaken because of a wrong comparison. FIXED-IN: 4.9.2 --- src/kitemviews/kfileitemmodelrolesupdater.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/kitemviews/kfileitemmodelrolesupdater.cpp') diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp index f3d4c0e76..f5de6b6dd 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.cpp +++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp @@ -215,7 +215,7 @@ bool KFileItemModelRolesUpdater::enlargeSmallPreviews() const void KFileItemModelRolesUpdater::setEnabledPlugins(const QStringList& list) { - if (m_enabledPlugins == list) { + if (m_enabledPlugins != list) { m_enabledPlugins = list; if (m_previewShown) { updateAllPreviews(); -- cgit v1.3.1