Fix disabling proxy on a clip when it crashed

diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp
index bb413bb5d730480017ea24497e9367aad3f8313e..cdd3eb0df2ad0d209a3b19a5841f4abf20f7bff3 100644 (file)
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -134,7 +134,7 @@ void ClipManager::stopThumbs(const QString &id)
     m_requestedThumbs.remove(id);
     m_thumbsMutex.unlock();
     m_abortThumb = false;
-    if (!m_thumbsThread.isRunning()) {
+    if (!m_thumbsThread.isRunning() && !m_requestedThumbs.isEmpty()) {
         m_thumbsThread = QtConcurrent::run(this, &ClipManager::slotGetThumbs);
     }
 }

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index 66842bc61083bbba73e025174ec2daee482fb8a3..c2ebfcfc346ac8c67267801bf44239c7eabd5a93 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -2834,6 +2834,10 @@ void ProjectList::setProxyStatus(ProjectItem *item, PROXYSTATUS status, int prog
             QDomElement xml = clip->toXML();
             m_render->getFileProperties(xml, clip->getId(), m_listView->iconSize().height(), true);
         }
+        else {
+            // Disable proxy for this clip
+            clip->setProperty("proxy", "-");
+        }
     }
     monitorItemEditing(true);
 }