Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLMC
Commits
11db9330
Commit
11db9330
authored
Aug 21, 2016
by
luyikei
Committed by
Hugo Beauzée-Luyssen
Sep 16, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SequenceWorkflow: Fix erasing the same iterator twice
Signed-off-by:
Hugo Beauzée-Luyssen
<
hugo@beauzee.fr
>
parent
485efb19
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
src/Workflow/SequenceWorkflow.cpp
src/Workflow/SequenceWorkflow.cpp
+5
-2
No files found.
src/Workflow/SequenceWorkflow.cpp
View file @
11db9330
...
...
@@ -119,9 +119,12 @@ SequenceWorkflow::moveClip( const QUuid& uuid, quint32 trackId, qint64 pos )
else
{
ret
=
track
->
move
(
std
::
get
<
ClipTupleIndex
::
Position
>
(
it
.
value
()
),
pos
);
if
(
ret
==
true
)
{
m_clips
.
erase
(
it
);
m_clips
.
insert
(
uuid
,
std
::
make_tuple
(
clip
,
trackId
,
pos
)
);
}
}
m_clips
.
erase
(
it
);
m_clips
.
insert
(
uuid
,
std
::
make_tuple
(
clip
,
trackId
,
pos
)
);
// TODO: If we detect collision too strictly, there will be a problem if we want to move multiple
// clips at the same time.
return
ret
;
...
...
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