From 116b6415b45fb0cef347e612994c8f9bd3cf8f7a Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Thu, 1 Dec 2011 15:34:20 +0100
Subject: [PATCH] Fix disabling proxy on a clip when it crashed

---
 src/clipmanager.cpp | 2 +-
 src/projectlist.cpp | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp
index bb413bb5..cdd3eb0d 100644
--- 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 66842bc6..c2ebfcfc 100644
--- 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);
 }
-- 
2.39.2