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
64722e24
Commit
64722e24
authored
Jun 09, 2021
by
Jean-Baptiste Mardelle
Browse files
Fix crash on exit when a mix is selected
parent
91601f5a
Pipeline
#64876
canceled with stage
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/timelinecontroller.cpp
View file @
64722e24
...
...
@@ -98,6 +98,8 @@ void TimelineController::prepareClose()
disconnect
(
m_model
.
get
(),
&
TimelineModel
::
selectionChanged
,
this
,
&
TimelineController
::
selectionChanged
);
disconnect
(
this
,
&
TimelineController
::
videoTargetChanged
,
this
,
&
TimelineController
::
updateVideoTarget
);
disconnect
(
this
,
&
TimelineController
::
audioTargetChanged
,
this
,
&
TimelineController
::
updateAudioTarget
);
disconnect
(
m_model
.
get
(),
&
TimelineModel
::
selectedMixChanged
,
this
,
&
TimelineController
::
showMixModel
);
disconnect
(
m_model
.
get
(),
&
TimelineModel
::
selectedMixChanged
,
this
,
&
TimelineController
::
selectedMixChanged
);
m_ready
=
false
;
m_root
=
nullptr
;
// Delete timeline preview before resetting model so that removing clips from timeline doesn't invalidate
...
...
@@ -133,10 +135,8 @@ void TimelineController::setModel(std::shared_ptr<TimelineItemModel> model)
connect
(
m_model
.
get
(),
&
TimelineModel
::
invalidateZone
,
this
,
&
TimelineController
::
invalidateZone
,
Qt
::
DirectConnection
);
connect
(
m_model
.
get
(),
&
TimelineModel
::
durationUpdated
,
this
,
&
TimelineController
::
checkDuration
);
connect
(
m_model
.
get
(),
&
TimelineModel
::
selectionChanged
,
this
,
&
TimelineController
::
selectionChanged
);
connect
(
m_model
.
get
(),
&
TimelineModel
::
selectedMixChanged
,
[
this
]
(
int
cid
,
const
std
::
shared_ptr
<
AssetParameterModel
>
&
asset
)
{
emit
showMixModel
(
cid
,
asset
);
emit
selectedMixChanged
();
});
connect
(
m_model
.
get
(),
&
TimelineModel
::
selectedMixChanged
,
this
,
&
TimelineController
::
showMixModel
);
connect
(
m_model
.
get
(),
&
TimelineModel
::
selectedMixChanged
,
this
,
&
TimelineController
::
selectedMixChanged
);
connect
(
m_model
.
get
(),
&
TimelineModel
::
checkTrackDeletion
,
this
,
&
TimelineController
::
checkTrackDeletion
,
Qt
::
DirectConnection
);
}
...
...
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