summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Mardelle <jb@kdenlive.org>2014-03-31 18:09:04 (GMT)
committerVincent PINON <vincent.pinon@laposte.net>2014-04-28 23:04:19 (GMT)
commitb7626cc194ea822b0560d585d983fbbf483a5502 (patch)
treecc9ae480b1c0e77fb1d01756d1b6935c8c9e9f66
parentd171e128d8abf27341e9e06b74f84bf1c06c8564 (diff)
Fix clip monitor not working when adding a clip
-rw-r--r--src/projectlist.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index a199c48..562b187 100644
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -1372,7 +1372,7 @@ void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties)
}
}
monitorItemEditing(true);
- updateButtons();
+ if (!getProperties) updateButtons();
}
void ProjectList::slotGotProxy(const QString &proxyPath)
@@ -2280,9 +2280,6 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce
if (item && producer) {
monitorItemEditing(false);
DocClipBase *clip = item->referencedClip();
- if (clip->getProducer() == NULL && replace) {
- replace = false;
- }
if (producer->is_valid()) {
if (clip->isPlaceHolder()) {
clip->setValid();
@@ -2341,8 +2338,9 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce
if (queue == 0) {
monitorItemEditing(true);
if (item && m_thumbnailQueue.isEmpty()) {
- if (!item->hasProxy() || m_render->activeClipId() == item->clipId())
+ if (!item->hasProxy() || m_render->activeClipId() == item->clipId()) {
m_listView->setCurrentItem(item);
+ }
bool updatedProfile = false;
if (item->parent()) {
if (item->parent()->type() == ProjectFoldeType)
@@ -2355,7 +2353,7 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce
}
}
if (updatedProfile == false) {
- //emit clipSelected(item->referencedClip());
+ emit clipSelected(item->referencedClip());
}
} else {
int max = m_doc->clipManager()->clipsCount();