Skip to content
GitLab
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
2ec6e3dd
Commit
2ec6e3dd
authored
Jan 09, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix one empty frame left when trying to put 2 clips together
parent
a8f474c5
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/model/timelinemodel.cpp
View file @
2ec6e3dd
...
...
@@ -1584,13 +1584,13 @@ bool TimelineModel::requestGroupMove(int itemId, int groupId, int delta_track, i
int
target_position
=
current_in
+
delta_pos
;
if
(
delta_pos
<
0
)
{
if
(
!
getTrackById_const
(
current_track_id
)
->
isAvailable
(
target_position
,
playtime
))
{
int
newStart
=
getTrackById_const
(
current_track_id
)
->
getBlankStart
(
current_in
-
1
);
if
(
newStart
==
current_in
-
1
)
{
if
(
!
getTrackById_const
(
current_track_id
)
->
isBlankAt
(
current_in
-
1
))
{
// No move possible, abort
bool
undone
=
local_undo
();
Q_ASSERT
(
undone
);
return
false
;
}
int
newStart
=
getTrackById_const
(
current_track_id
)
->
getBlankStart
(
current_in
-
1
);
delta_pos
=
qMax
(
delta_pos
,
newStart
-
current_in
);
}
}
else
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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