From ab51067165fe1025162f3a09b07285b9caa44014 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Wed, 6 Jul 2011 11:05:12 +0000 Subject: [PATCH] Fix proxy clips reloaded twice on project opening: http://kdenlive.org/mantis/view.php?id=2218 svn path=/trunk/kdenlive/; revision=5769 --- src/projectlist.cpp | 4 ++-- src/projectlist.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/projectlist.cpp b/src/projectlist.cpp index e5b240b3..03f05f84 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -1074,7 +1074,7 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) void ProjectList::slotGotProxy(const QString &proxyPath) { - if (proxyPath.isEmpty()) return; + if (proxyPath.isEmpty() || !m_refreshed) return; QTreeWidgetItemIterator it(m_listView); ProjectItem *item; @@ -1090,7 +1090,7 @@ void ProjectList::slotGotProxy(const QString &proxyPath) void ProjectList::slotGotProxy(ProjectItem *item) { - if (item == NULL) return; + if (item == NULL || !m_refreshed) return; DocClipBase *clip = item->referencedClip(); // Proxy clip successfully created QDomElement e = clip->toXML().cloneNode().toElement(); diff --git a/src/projectlist.h b/src/projectlist.h index 934856ef..b064f4ba 100644 --- a/src/projectlist.h +++ b/src/projectlist.h @@ -259,7 +259,7 @@ private: QMenu *m_transcodeAction; KdenliveDoc *m_doc; ItemDelegate *m_listViewDelegate; - /** @brief True if we have not yet finished opening the document. */ + /** @brief False if we have not yet finished opening the document. */ bool m_refreshed; QToolButton *m_addButton; QToolButton *m_deleteButton; -- 2.39.2