From 18ce8b4bbb2b8b4260aa34ed090f54ec074376fa Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Tue, 25 Oct 2011 20:00:50 +0000 Subject: [PATCH] Fix recent regression in clip duration svn path=/trunk/kdenlive/; revision=5991 --- src/docclipbase.cpp | 4 ++-- src/renderer.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp index 5c06003c..adeb59c1 100644 --- a/src/docclipbase.cpp +++ b/src/docclipbase.cpp @@ -651,8 +651,8 @@ Mlt::Producer *DocClipBase::getCloneProducer() adjustProducerProperties(prod, getId() + "_", false, false); if (!m_properties.contains("proxy_out")) { // Adjust length in case... - prod->set("length", m_properties.value("duration").toInt()); - prod->set("out", m_properties.value("out").toInt()); + if (m_properties.contains("duration")) prod->set("length", m_properties.value("duration").toInt()); + if (m_properties.contains("out"))prod->set("out", m_properties.value("out").toInt()); } } return prod; diff --git a/src/renderer.cpp b/src/renderer.cpp index 6c6f7804..ee07e4c6 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -1180,9 +1180,9 @@ int Render::setSceneList(QString playlist, int position) kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime(); m_mltConsumer->connect(*m_mltProducer); m_mltProducer->set_speed(0); - emit durationChanged(m_mltProducer->get_playtime()); fillSlowMotionProducers(); blockSignals(false); + emit durationChanged(m_mltProducer->get_playtime()); return error; //kDebug()<<"// SETSCN LST, POS: "<