dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No need to delete pixmap cache when deleting empty parents

Browse Source
This commit is contained in:
Jonas Kvinge
2019-11-13 21:16:48 +01:00
parent bc0c50ee65
commit c8d580e7de
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/collection/collectionmodel.cpp
View File

@@ -434,8 +434,9 @@ void CollectionModel::SongsDeleted(const SongList &songs) {
if (node->parent != root_) parents << node->parent; if (node->parent != root_) parents << node->parent;
// Remove from pixmap cache
QModelIndex idx = ItemToIndex(node->parent); QModelIndex idx = ItemToIndex(node->parent);
// Remove from pixmap cache
const QString cache_key = AlbumIconPixmapCacheKey(idx); const QString cache_key = AlbumIconPixmapCacheKey(idx);
QPixmapCache::remove(cache_key); QPixmapCache::remove(cache_key);
if (pending_cache_keys_.contains(cache_key)) pending_cache_keys_.remove(cache_key); if (pending_cache_keys_.contains(cache_key)) pending_cache_keys_.remove(cache_key);
@@ -486,22 +487,6 @@ void CollectionModel::SongsDeleted(const SongList &songs) {
else else
container_nodes_[node->container_level].remove(node->key); container_nodes_[node->container_level].remove(node->key);
// Remove from pixmap cache
QModelIndex idx = ItemToIndex(node->parent);
const QString cache_key = AlbumIconPixmapCacheKey(idx);
QPixmapCache::remove(cache_key);
if (pending_cache_keys_.contains(cache_key)) pending_cache_keys_.remove(cache_key);
// Remove from pending art loading
QMapIterator<quint64, ItemAndCacheKey> i(pending_art_);
while (i.hasNext()) {
i.next();
if (i.value().first == node) {
pending_art_.remove(i.key());
break;
}
}
// It was empty - delete it // It was empty - delete it
beginRemoveRows(ItemToIndex(node->parent), node->row, node->row); beginRemoveRows(ItemToIndex(node->parent), node->row, node->row);
node->parent->Delete(node->row); node->parent->Delete(node->row);