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
bc104195
Commit
bc104195
authored
Dec 12, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix regression with crash in effect stack
parent
b6f8ec16
Pipeline
#43816
passed with stage
in 9 minutes and 59 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/assets/view/widgets/keyframewidget.cpp
View file @
bc104195
...
...
@@ -98,9 +98,9 @@ KeyframeWidget::KeyframeWidget(std::shared_ptr<AssetParameterModel> model, QMode
m_buttonApply
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"edit-paste"
)));
m_buttonApply
->
setToolTip
(
i18n
(
"Apply value to selected keyframes"
));
m_buttonApply
->
setFocusPolicy
(
Qt
::
StrongFocus
);
connect
(
qApp
,
&
QApplication
::
focusChanged
,
[
this
](
QWidget
*
old
,
QWidget
*
now
)
{
m_focusConnection
=
connect
(
qApp
,
&
QApplication
::
focusChanged
,
[
this
](
QWidget
*
old
,
QWidget
*
now
)
{
if
(
now
==
m_buttonApply
)
{
if
(
old
&&
old
->
parentWidget
())
{
if
(
old
&&
old
->
parentWidget
()
&&
isAncestorOf
(
old
->
parentWidget
())
)
{
m_lastFocusedParam
=
old
->
parentWidget
()
->
objectName
();
qDebug
()
<<
"======= FROM PARENT: "
<<
old
->
parentWidget
()
->
objectName
();
}
...
...
@@ -241,6 +241,7 @@ KeyframeWidget::KeyframeWidget(std::shared_ptr<AssetParameterModel> model, QMode
KeyframeWidget
::~
KeyframeWidget
()
{
QObject
::
disconnect
(
m_focusConnection
);
delete
m_keyframeview
;
delete
m_buttonAddDelete
;
delete
m_buttonPrevious
;
...
...
src/assets/view/widgets/keyframewidget.hpp
View file @
bc104195
...
...
@@ -87,6 +87,7 @@ private:
QVBoxLayout
*
m_lay
;
QToolBar
*
m_toolbar
;
std
::
shared_ptr
<
KeyframeModelList
>
m_keyframes
;
QMetaObject
::
Connection
m_focusConnection
;
KeyframeView
*
m_keyframeview
;
KeyframeMonitorHelper
*
m_monitorHelper
;
QToolButton
*
m_buttonAddDelete
;
...
...
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