From: Jean-Baptiste M. <jb...@kd...> - 2012-12-26 01:11:06
|
Git commit 68c7f874ec7e30e78e857cb84401871ab4148b28 by Jean-Baptiste Mardelle. Committed on 26/12/2012 at 02:10. Pushed by mardelle into branch 'master'. Fix loading of 1 frame long title clips M +15 -7 src/clipmanager.cpp http://commits.kde.org/kdenlive/68c7f874ec7e30e78e857cb84401871ab4148b28 diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp index 38ae8e9..55a947f 100644 --- a/src/clipmanager.cpp +++ b/src/clipmanager.cpp @@ -604,15 +604,23 @@ void ClipManager::slotAddClipList(const KUrl::List urls, QMap <QString, QString> } } } - QString titleData = txtdoc.toString(); - prod.setAttribute("xmldata", titleData); prod.setAttribute("transparency", 1); prod.setAttribute("in", 0); - int out = txtdoc.documentElement().attribute("out").toInt(); - if (out > 0) - prod.setAttribute("out", out); - else - prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::title_duration()) - 1); + if (!txtdoc.documentElement().hasAttribute("out")) { + prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::title_duration()) - 1); + txtdoc.documentElement().setAttribute("out", m_doc->getFramePos(KdenliveSettings::title_duration()) - 1); + } + else { + int out = txtdoc.documentElement().attribute("out").toInt(); + if (out >= 0) + prod.setAttribute("out", out); + else { + prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::title_duration()) - 1); + txtdoc.documentElement().setAttribute("out", m_doc->getFramePos(KdenliveSettings::title_duration()) - 1); + } + } + QString titleData = txtdoc.toString(); + prod.setAttribute("xmldata", titleData); } else txtfile.close(); } |