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
a73d42f5
Commit
a73d42f5
authored
Mar 18, 2022
by
Jean-Baptiste Mardelle
Browse files
Fix crash and corruption (disappearing effect) when dropping a clip close to 0 in timeline.
Related to
#1371
parent
33634f32
Pipeline
#151978
passed with stage
in 6 minutes and 58 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/Track.qml
View file @
a73d42f5
...
...
@@ -283,8 +283,7 @@ Item{
item
.
audioStream
=
model
.
audioStream
item
.
multiStream
=
model
.
multiStream
item
.
aStreamIndex
=
model
.
audioStreamIndex
console
.
log
(
'
loaded clip with Astream:
'
,
model
.
audioStream
)
console
.
log
(
'
loaded clip with Astream:
'
,
model
.
audioStream
)
}
else
if
(
model
.
clipType
==
ProducerType
.
Composition
)
{
console
.
log
(
'
loaded composition:
'
,
model
.
start
,
'
, ID:
'
,
model
.
item
,
'
, index:
'
,
trackRoot
.
DelegateModel
.
itemsIndex
)
//item.aTrack = model.a_track
...
...
src/timeline2/view/qml/timeline.qml
View file @
a73d42f5
...
...
@@ -299,7 +299,6 @@ Rectangle {
}
function
endDrag
()
{
console
.
log
(
'
ENDING DRAG!!!!!!!!!!!!!!!!!!!!!!
\n
'
)
dragProxy
.
draggedItem
=
-
1
dragProxy
.
x
=
0
dragProxy
.
y
=
0
...
...
@@ -712,6 +711,7 @@ Rectangle {
clearDropData
()
}
else
{
// Clip is dropped
processDrop
()
}
}
onPositionChanged
:
{
...
...
@@ -2087,7 +2087,6 @@ Rectangle {
}
}
// This provides continuous scrolling at the left/right edges.
Timer
{
id
:
scrollTimer
...
...
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