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
dd4d8d37
Commit
dd4d8d37
authored
Jul 20, 2021
by
Jean-Baptiste Mardelle
Browse files
Revert "Fix clips with mix cannot be move onto another track."
This reverts commit
2b4fcacc
parent
2b4fcacc
Pipeline
#71240
passed with stage
in 8 minutes and 25 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
src/timeline2/model/trackmodel.cpp
View file @
dd4d8d37
...
...
@@ -208,8 +208,8 @@ Fun TrackModel::requestClipInsertion_lambda(int clipId, int position, bool updat
qDebug
()
<<
"Error : Clip Insertion failed because timeline is not available anymore"
;
return
false
;
};
if
(
!
finalMove
&&
!
hasMix
(
clipId
)
&&
!
m_playlists
[
0
].
is_blank_at
(
target_playlist
))
{
qDebug
()
<<
"==== WARNING INVALID MOVE
FOR CLIP"
<<
clipId
;
if
(
!
finalMove
&&
!
hasMix
(
clipId
)
&&
(
!
m_playlists
[
0
].
is_blank_at
(
position
)
||
!
m_playlists
[
1
].
is_blank_at
(
position
)
))
{
qDebug
()
<<
"==== WARNING INVALID MOVE
"
;
return
[]()
{
return
false
;
};
}
if
(
target_clip
>=
count
&&
m_playlists
[
target_playlist
].
is_blank_at
(
position
))
{
...
...
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