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
a8599d6e
Commit
a8599d6e
authored
Jun 10, 2021
by
Jean-Baptiste Mardelle
Browse files
Mix: Fix first clip out not correctly reset on second clip deletion
parent
f305f37d
Pipeline
#65027
canceled with stage
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/model/timelinemodel.cpp
View file @
a8599d6e
...
...
@@ -1840,6 +1840,12 @@ bool TimelineModel::requestClipDeletion(int clipId, Fun &undo, Fun &redo)
res
=
getTrackById
(
trackId
)
->
requestRemoveMix
({
clipId
,
mixData
.
secondClipId
},
undo
,
redo
);
}
}
if
(
getTrackById_const
(
trackId
)
->
hasStartMix
(
clipId
))
{
MixInfo
mixData
=
getTrackById_const
(
trackId
)
->
getMixInfo
(
clipId
).
first
;
if
(
isClip
(
mixData
.
firstClipId
))
{
res
=
getTrackById
(
trackId
)
->
requestRemoveMix
({
mixData
.
firstClipId
,
clipId
},
undo
,
redo
);
}
}
res
=
res
&&
getTrackById
(
trackId
)
->
requestClipDeletion
(
clipId
,
true
,
!
m_closing
,
undo
,
redo
,
false
,
true
);
if
(
!
res
)
{
undo
();
...
...
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