aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Mardelle <[email protected]>2016-07-14 14:09:30 +0200
committerJean-Baptiste Mardelle <[email protected]>2016-07-14 14:09:30 +0200
commitaf8dbb0363df7a84bbad18f7ea4cb02cc0a4b96a (patch)
treed1ed0e68f5593e0aec5afd2de68dcd0454496853
parent10dd671d0f220aac048769dee6d7fc71521f6213 (diff)
Fix title/color clip duration broken after edit
-rw-r--r--src/bin/bin.cpp2
-rw-r--r--src/timeline/clipitem.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/bin/bin.cpp b/src/bin/bin.cpp
index 8dba8e8..b68118d 100644
--- a/src/bin/bin.cpp
+++ b/src/bin/bin.cpp
@@ -3023,8 +3023,6 @@ void Bin::showTitleWidget(ProjectClip *clip)
int currentLength = clip->getProducerIntProperty(QStringLiteral("length"));
if (currentLength <= dia_ui.duration()) {
newprops.insert(QStringLiteral("length"), QString::number(dia_ui.duration()));
- } else {
- newprops.insert(QStringLiteral("length"), clip->getProducerProperty(QStringLiteral("length")));
}
}
// trigger producer reload
diff --git a/src/timeline/clipitem.cpp b/src/timeline/clipitem.cpp
index 10222e7..8801641 100644
--- a/src/timeline/clipitem.cpp
+++ b/src/timeline/clipitem.cpp
@@ -353,7 +353,7 @@ void ClipItem::resetThumbs(bool clearExistingThumbs)
void ClipItem::refreshClip(bool checkDuration, bool forceResetThumbs)
{
- if (checkDuration && (m_maxDuration != m_binClip->duration())) {
+ if (checkDuration && m_binClip->hasLimitedDuration() && (m_maxDuration != m_binClip->duration())) {
m_maxDuration = m_binClip->duration();
if (m_clipType != Image && m_clipType != Text && m_clipType != QText && m_clipType != Color && m_clipType != TextTemplate) {
if (m_maxDuration != GenTime() && m_info.cropStart + m_info.cropDuration > m_maxDuration) {