Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Heiko Becker
kdenlive
Commits
0803d6ed
Commit
0803d6ed
authored
Apr 11, 2019
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix error when trying to insert composition in the middle of a clip
parent
a845dcf6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
src/timeline2/view/timelinecontroller.cpp
src/timeline2/view/timelinecontroller.cpp
+6
-0
No files found.
src/timeline2/view/timelinecontroller.cpp
View file @
0803d6ed
...
...
@@ -328,6 +328,12 @@ int TimelineController::insertNewComposition(int tid, int clipId, int offset, co
int
position
=
minimum
;
if
(
offset
>
clip_duration
/
2
)
{
position
+=
offset
;
}
else
{
// Check if we have a composition at beginning
std
::
unordered_set
<
int
>
existing
=
m_model
->
getTrackById_const
(
tid
)
->
getCompositionsInRange
(
minimum
,
minimum
+
offset
);
if
(
existing
.
size
()
>
0
)
{
position
+=
offset
;
}
}
position
=
qMin
(
minimum
+
clip_duration
-
1
,
position
);
int
duration
=
m_model
->
getTrackById_const
(
tid
)
->
suggestCompositionLength
(
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