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
a4aef884
Commit
a4aef884
authored
Oct 20, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix keyframeable effect params left enabled when selecting a clip, leading to possible crash
parent
cce8bcc4
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/assets/view/assetparameterview.cpp
View file @
a4aef884
...
...
@@ -26,6 +26,7 @@
#include "assets/view/widgets/abstractparamwidget.hpp"
#include "assets/view/widgets/keyframewidget.hpp"
#include "core.h"
#include "monitor/monitor.h"
#include <QActionGroup>
#include <QDebug>
...
...
@@ -131,6 +132,9 @@ void AssetParameterView::setModel(const std::shared_ptr<AssetParameterModel> &mo
if
(
addSpacer
)
{
m_lay
->
addStretch
();
}
// Ensure effect parameters are adjusted to current position
Monitor
*
monitor
=
pCore
->
getMonitor
(
m_model
->
monitorId
);
emit
monitor
->
seekPosition
(
monitor
->
position
());
}
QVector
<
QPair
<
QString
,
QVariant
>>
AssetParameterView
::
getDefaultValues
()
const
...
...
src/assets/view/widgets/keyframewidget.cpp
View file @
a4aef884
...
...
@@ -163,7 +163,6 @@ KeyframeWidget::KeyframeWidget(std::shared_ptr<AssetParameterModel> model, QMode
m_lay
->
addWidget
(
m_keyframeview
);
m_lay
->
addWidget
(
m_toolbar
);
monitorSeek
(
monitor
->
position
());
connect
(
m_time
,
&
TimecodeDisplay
::
timeCodeEditingFinished
,
[
&
]()
{
slotSetPosition
(
-
1
,
true
);
});
connect
(
m_keyframeview
,
&
KeyframeView
::
seekToPos
,
[
&
](
int
p
)
{
slotSetPosition
(
p
,
true
);
});
...
...
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