]> git.sesse.net Git - kdenlive/commitdiff
Fix broken clip when opening a project in which a proxy clip was missing
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Sun, 30 Oct 2011 12:45:11 +0000 (12:45 +0000)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Sun, 30 Oct 2011 12:45:11 +0000 (12:45 +0000)
svn path=/trunk/kdenlive/; revision=6004

src/projectlist.cpp

index eb17ca2e4e7ddf726ba32d07e27b5acb67cef2f0..0879fbb4002005e388d62cc32abde6f5a62b068f 100644 (file)
@@ -1267,7 +1267,7 @@ void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged)
             item = static_cast <ProjectItem *>(*it);
             clip = item->referencedClip();
             if (item->referencedClip()->getProducer() == NULL) {
-                if (clip->isPlaceHolder() == false) {
+                if (clip->isPlaceHolder() == false && !item->isProxyRunning()) {
                     QDomElement xml = clip->toXML();
                     if (fpsChanged) {
                         xml.removeAttribute("out");
@@ -1837,7 +1837,7 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce
             int max = m_doc->clipManager()->clipsCount();
             emit displayMessage(i18n("Loading clips"), (int)(100 *(max - queue) / max));
         }
-        if (m_allClipsProcessed) processNextThumbnail();
+        if (m_allClipsProcessed) emit processNextThumbnail();
     }
     if (replace && item) {
         toReload = clipId;