From af8dbb0363df7a84bbad18f7ea4cb02cc0a4b96a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Thu, 14 Jul 2016 14:09:30 +0200 Subject: [PATCH] Fix title/color clip duration broken after edit CCBUG: 365653 --- src/bin/bin.cpp | 2 -- src/timeline/clipitem.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/bin/bin.cpp b/src/bin/bin.cpp index 8dba8e898..b68118d93 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 10222e7de..88016415b 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) { -- GitLab