Fix timeline video thumbnails sometimes not showing up

diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp
index 8937aaf46a3d8a7e230886300c5b04f20d54c2b7..bb413bb5d730480017ea24497e9367aad3f8313e 100644 (file)
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -141,15 +141,15 @@ void ClipManager::stopThumbs(const QString &id)
 
 void ClipManager::slotGetThumbs()
 {
-    QMap<QString, int>::iterator i = m_requestedThumbs.begin();
+    QMap<QString, int>::const_iterator i;
     int max;
     int done = 0;
-    while (i != m_requestedThumbs.end() && !m_abortThumb) {
-        QString producerId = i.key();
+    while (!m_requestedThumbs.isEmpty() && !m_abortThumb) {
         m_thumbsMutex.lock();
+        i = m_requestedThumbs.constBegin();
+        QString producerId = i.key();
         QList<int> values = m_requestedThumbs.values(producerId);
         m_requestedThumbs.remove(producerId);
-        i = m_requestedThumbs.begin();
         m_thumbsMutex.unlock();
         qSort(values);
         DocClipBase *clip = getClipById(producerId);

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index 50ba864f890c7c21254a66403593b538a3587638..7cf7c3716e11669d32ac8855366c560a9d6faa8f 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -2765,7 +2765,6 @@ void ProjectList::slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy)
                 continue;
             }
                 
-            resetThumbsProducer(clip);
             oldProps = clip->properties();
             if (doProxy) {
                 newProps.clear();