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
60b313db
Commit
60b313db
authored
Jul 24, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix bin clip sometimes incorrectly selected causing incorrect drag in timeline
parent
aa798c94
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/bin/bin.cpp
View file @
60b313db
...
...
@@ -1659,6 +1659,8 @@ void Bin::setDocument(KdenliveDoc *project)
m_proxyModel
->
selectionModel
()
->
blockSignals
(
true
);
}
setEnabled
(
false
);
// Cleanup references in the cli properties dialog
showClipProperties
(
nullptr
);
// Cleanup previous project
m_itemModel
->
clean
();
...
...
@@ -2528,6 +2530,9 @@ void Bin::reloadMonitorIfActive(const QString &id)
{
if
(
m_monitor
->
activeClipId
()
==
id
||
m_monitor
->
activeClipId
().
isEmpty
())
{
slotOpenCurrent
();
if
(
m_monitor
->
activeClipId
()
==
id
)
{
showClipProperties
(
getBinClip
(
id
),
true
);
}
}
}
...
...
src/bin/projectclip.cpp
View file @
60b313db
...
...
@@ -457,9 +457,6 @@ bool ProjectClip::setProducer(std::shared_ptr<Mlt::Producer> producer, bool repl
m_clipStatus
=
StatusReady
;
setTags
(
getProducerProperty
(
QStringLiteral
(
"kdenlive:tags"
)));
AbstractProjectItem
::
setRating
((
uint
)
getProducerIntProperty
(
QStringLiteral
(
"kdenlive:rating"
)));
if
(
!
hasProxy
())
{
if
(
auto
ptr
=
m_model
.
lock
())
emit
std
::
static_pointer_cast
<
ProjectItemModel
>
(
ptr
)
->
refreshPanel
(
m_binId
);
}
if
(
auto
ptr
=
m_model
.
lock
())
{
std
::
static_pointer_cast
<
ProjectItemModel
>
(
ptr
)
->
onItemUpdated
(
std
::
static_pointer_cast
<
ProjectClip
>
(
shared_from_this
()),
AbstractProjectItem
::
DataDuration
);
...
...
@@ -511,7 +508,6 @@ bool ProjectClip::setProducer(std::shared_ptr<Mlt::Producer> producer, bool repl
}
}
pCore
->
bin
()
->
reloadMonitorIfActive
(
clipId
());
pCore
->
bin
()
->
updateTargets
(
clipId
());
for
(
auto
&
p
:
m_audioProducers
)
{
m_effectStack
->
removeService
(
p
.
second
);
}
...
...
Write
Preview
Supports
Markdown
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