[Kdenlive-svn] [kdenlive] src: Fix folder rename appearing when opening project

[Jean-Baptiste M. <jb...@kd...>]

Git commit 5592ccc13c0f8377b58dd4e3cb6dcd2315d37b30 by Jean-Baptiste Mardelle.
Committed on 14/01/2013 at 23:12.
Pushed by mardelle into branch 'master'.

Fix folder rename appearing when opening project

M  +2    -0    src/projectlist.cpp

http://commits.kde.org/kdenlive/5592ccc13c0f8377b58dd4e3cb6dcd2315d37b30

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index cb78f06..1db09d1 100644
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -1015,6 +1015,7 @@ void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column)
     if (item->type() == PROJECTFOLDERTYPE) {
         if (column == 0) {
             FolderProjectItem *folder = static_cast <FolderProjectItem*>(item);
+	    if (item->text(0) == folder->groupName()) return;
             editFolder(item->text(0), folder->groupName(), folder->clipId());
             folder->setGroupName(item->text(0));
             m_doc->clipManager()->addFolder(folder->clipId(), item->text(0));
@@ -2229,6 +2230,7 @@ void ProjectList::extractMetadata(DocClipBase *clip)
 
 void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const stringMap &properties, const stringMap &metadata, bool replace)
 {
+    QMutexLocker lock(&m_processMutex);
     QString toReload;
     ProjectItem *item = getItemById(clipId);
     if (item && producer) {