Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
3edca1b2
Commit
3edca1b2
authored
Oct 19, 2021
by
Jean-Baptiste Mardelle
Browse files
Fix crash and incorrect resize with same track transitions
parent
03c50600
Pipeline
#89796
passed with stage
in 8 minutes and 26 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/model/trackmodel.cpp
View file @
3edca1b2
...
...
@@ -741,9 +741,8 @@ Fun TrackModel::requestClipResize_lambda(int clipId, int in, int out, bool right
if
(
err
==
0
)
{
QScopedPointer
<
Mlt
::
Producer
>
clip
(
m_playlists
[
target_track
].
get_clip
(
target_clip_mutable
));
if
(
out
>=
clip
->
get_length
())
{
clip
->
parent
().
set
(
"length"
,
out
+
1
);
clip
->
parent
().
set
(
"out"
,
out
);
clip
->
set
(
"length"
,
out
+
1
);
clip
->
set
(
"out"
,
out
);
}
err
=
m_playlists
[
target_track
].
resize_clip
(
target_clip_mutable
,
in
,
out
);
}
...
...
@@ -2214,6 +2213,10 @@ void TrackModel::setMixDuration(int cid, int mixDuration, int mixCut)
{
m_allClips
[
cid
]
->
setMixDuration
(
mixDuration
,
mixCut
);
m_sameCompositions
[
cid
]
->
getAsset
()
->
set
(
"kdenlive:mixcut"
,
mixCut
);
int
in
=
m_allClips
[
cid
]
->
getPosition
();
int
out
=
in
+
mixDuration
;
Mlt
::
Transition
&
transition
=
*
static_cast
<
Mlt
::
Transition
*>
(
m_sameCompositions
[
cid
]
->
getAsset
());
transition
.
set_in_and_out
(
in
,
out
);
emit
m_sameCompositions
[
cid
]
->
dataChanged
(
QModelIndex
(),
QModelIndex
(),
{
AssetParameterModel
::
ParentDurationRole
});
}
...
...
Write
Preview
Supports
Markdown
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