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
10dd671d
Commit
10dd671d
authored
Jul 14, 2016
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix corruption on resize color/title clips after reloading /editing clip from bin
parent
c619fd15
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
src/mltcontroller/producerqueue.cpp
src/mltcontroller/producerqueue.cpp
+5
-1
src/timeline/customtrackview.cpp
src/timeline/customtrackview.cpp
+4
-2
src/timeline/managers/movemanager.cpp
src/timeline/managers/movemanager.cpp
+1
-0
No files found.
src/mltcontroller/producerqueue.cpp
View file @
10dd671d
...
...
@@ -415,8 +415,12 @@ void ProducerQueue::processFileProperties()
if
(
info
.
xml
.
hasAttribute
(
QStringLiteral
(
"length"
)))
{
length
=
info
.
xml
.
attribute
(
QStringLiteral
(
"length"
)).
toInt
();
clipOut
=
length
-
1
;
}
else
{
length
=
EffectsList
::
property
(
info
.
xml
,
QStringLiteral
(
"length"
)).
toInt
();
clipOut
=
info
.
xml
.
attribute
(
QStringLiteral
(
"out"
)).
toInt
()
-
info
.
xml
.
attribute
(
QStringLiteral
(
"in"
)).
toInt
();
if
(
length
<
clipOut
)
length
=
clipOut
+
1
;
}
else
length
=
info
.
xml
.
attribute
(
QStringLiteral
(
"out"
)).
toInt
()
-
info
.
xml
.
attribute
(
QStringLiteral
(
"in"
)).
toInt
()
+
1
;
// Pass duration if it was forced
if
(
info
.
xml
.
hasAttribute
(
QStringLiteral
(
"duration"
)))
{
duration
=
info
.
xml
.
attribute
(
QStringLiteral
(
"duration"
)).
toInt
();
...
...
src/timeline/customtrackview.cpp
View file @
10dd671d
...
...
@@ -5056,7 +5056,9 @@ Transition *CustomTrackView::getTransitionItemAtStart(GenTime pos, int track)
bool
CustomTrackView
::
moveClip
(
const
ItemInfo
&
start
,
const
ItemInfo
&
end
,
bool
refresh
,
bool
alreadyMoved
,
ItemInfo
*
out_actualEnd
)
{
if
(
m_selectionGroup
)
resetSelectionGroup
(
false
);
if
(
m_selectionGroup
)
{
resetSelectionGroup
(
false
);
}
ClipItem
*
item
=
NULL
;
if
(
alreadyMoved
)
{
item
=
getClipItemAtStart
(
end
.
startPos
,
end
.
track
);
...
...
@@ -5110,7 +5112,7 @@ bool CustomTrackView::moveClip(const ItemInfo &start, const ItemInfo &end, bool
}*/
KdenliveSettings
::
setSnaptopoints
(
snap
);
}
if
(
refresh
)
if
(
refresh
)
monitorRefresh
(
range
,
true
);
if
(
out_actualEnd
!=
NULL
)
{
*
out_actualEnd
=
item
->
info
();
...
...
src/timeline/managers/movemanager.cpp
View file @
10dd671d
...
...
@@ -231,6 +231,7 @@ void MoveManager::mouseRelease(GenTime pos)
item
=
m_view
->
getClipItemAtStart
(
info
.
startPos
,
info
.
track
,
info
.
endPos
);
if
(
item
)
{
item
->
setItemLocked
(
isLocked
);
item
->
setSelected
(
true
);
}
}
else
{
// undo last move and emit error message
...
...
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