Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Multimedia
Kdenlive
Commits
af8dbb03
Commit
af8dbb03
authored
Jul 14, 2016
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix title/color clip duration broken after edit
CCBUG: 365653
parent
10dd671d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
3 deletions
+1
-3
src/bin/bin.cpp
src/bin/bin.cpp
+0
-2
src/timeline/clipitem.cpp
src/timeline/clipitem.cpp
+1
-1
No files found.
src/bin/bin.cpp
View file @
af8dbb03
...
...
@@ -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
...
...
src/timeline/clipitem.cpp
View file @
af8dbb03
...
...
@@ -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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment