]> git.sesse.net Git - kdenlive/commitdiff
Fix folder rename appearing when opening project
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Mon, 14 Jan 2013 22:12:34 +0000 (23:12 +0100)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Mon, 14 Jan 2013 22:12:34 +0000 (23:12 +0100)
src/projectlist.cpp

index cb78f0684ae6e337bb05334db4af4e71e058c819..1db09d13dde10f3e009ebb2d647bbd273aad1ec2 100644 (file)
@@ -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) {