Skip to content
GitLab
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
0e9e81f5
Commit
0e9e81f5
authored
Dec 30, 2018
by
Jean-Baptiste Mardelle
Browse files
Fix crash on composition selection
parent
92425f81
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/assets/keyframes/view/keyframeview.cpp
View file @
0e9e81f5
...
...
@@ -28,10 +28,10 @@
#include
<KColorScheme>
#include
<QFontDatabase>
KeyframeView
::
KeyframeView
(
std
::
shared_ptr
<
KeyframeModelList
>
model
,
QWidget
*
parent
)
KeyframeView
::
KeyframeView
(
std
::
shared_ptr
<
KeyframeModelList
>
model
,
int
duration
,
QWidget
*
parent
)
:
QWidget
(
parent
)
,
m_model
(
model
)
,
m_duration
(
1
)
,
m_duration
(
duration
)
,
m_position
(
0
)
,
m_currentKeyframe
(
-
1
)
,
m_currentKeyframeOriginal
(
-
1
)
...
...
src/assets/keyframes/view/keyframeview.hpp
View file @
0e9e81f5
...
...
@@ -32,7 +32,7 @@ class KeyframeView : public QWidget
Q_OBJECT
public:
explicit
KeyframeView
(
std
::
shared_ptr
<
KeyframeModelList
>
model
,
QWidget
*
parent
=
nullptr
);
explicit
KeyframeView
(
std
::
shared_ptr
<
KeyframeModelList
>
model
,
int
duration
,
QWidget
*
parent
=
nullptr
);
void
setDuration
(
int
dur
);
public
slots
:
...
...
src/assets/view/widgets/keyframewidget.cpp
View file @
0e9e81f5
...
...
@@ -47,7 +47,6 @@
KeyframeWidget
::
KeyframeWidget
(
std
::
shared_ptr
<
AssetParameterModel
>
model
,
QModelIndex
index
,
QWidget
*
parent
)
:
AbstractParamWidget
(
model
,
index
,
parent
)
,
m_keyframes
(
model
->
getKeyframeModel
())
,
m_monitorHelper
(
nullptr
)
,
m_neededScene
(
MonitorSceneType
::
MonitorSceneDefault
)
{
...
...
@@ -60,8 +59,9 @@ KeyframeWidget::KeyframeWidget(std::shared_ptr<AssetParameterModel> model, QMode
bool
ok
=
false
;
int
duration
=
m_model
->
data
(
m_index
,
AssetParameterModel
::
ParentDurationRole
).
toInt
(
&
ok
);
Q_ASSERT
(
ok
);
m_keyframeview
=
new
KeyframeView
(
m_keyframes
,
this
);
m_keyframeview
->
setDuration
(
duration
);
m_model
->
prepareKeyframes
();
m_keyframes
=
m_model
->
getKeyframeModel
();
m_keyframeview
=
new
KeyframeView
(
m_keyframes
,
duration
,
this
);
m_buttonAddDelete
=
new
QToolButton
(
this
);
m_buttonAddDelete
->
setAutoRaise
(
true
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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