From 13326c9946ad59b996c45b1f665c9291c0e9b6d1 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Mon, 8 Apr 2019 18:10:28 +0200 Subject: [PATCH] Fix title clip thumbs not updated on change. Fixes #128 --- src/bin/projectclip.cpp | 2 +- src/utils/thumbnailcache.cpp | 1 + src/utils/thumbnailcache.hpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bin/projectclip.cpp b/src/bin/projectclip.cpp index 6912b359d..f7b278844 100644 --- a/src/bin/projectclip.cpp +++ b/src/bin/projectclip.cpp @@ -1044,7 +1044,7 @@ void ProjectClip::setProperties(const QMap &properties, bool r updateTimelineClips(updateRoles); } } - if (!passProperties.isEmpty()) { + if (!passProperties.isEmpty() && (!reload || refreshOnly)) { if (auto ptr = m_model.lock()) emit std::static_pointer_cast(ptr)->updateTimelineProducers(m_binId, passProperties); } } diff --git a/src/utils/thumbnailcache.cpp b/src/utils/thumbnailcache.cpp index 931679b8d..68955e0aa 100644 --- a/src/utils/thumbnailcache.cpp +++ b/src/utils/thumbnailcache.cpp @@ -128,6 +128,7 @@ QImage ThumbnailCache::getThumbnail(const QString &binId, int pos, bool volatile } QDir thumbFolder = getDir(&ok); if (ok && thumbFolder.exists(key)) { + m_storedOnDisk[binId].push_back(pos); return QImage(thumbFolder.absoluteFilePath(key)); } return QImage(); diff --git a/src/utils/thumbnailcache.hpp b/src/utils/thumbnailcache.hpp index 25f0c601a..2e1068a76 100644 --- a/src/utils/thumbnailcache.hpp +++ b/src/utils/thumbnailcache.hpp @@ -93,5 +93,5 @@ protected: // the following maps keeps track of the positions that we store for each clip in volatile caches. // Note that we don't track deletions due to items dropped from the cache. So the maps can contain more items that are currently stored. std::unordered_map> m_storedVolatile; - std::unordered_map> m_storedOnDisk; + mutable std::unordered_map> m_storedOnDisk; }; -- GitLab