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
58d2b03f
Commit
58d2b03f
authored
Mar 11, 2022
by
Jean-Baptiste Mardelle
Browse files
Fix timeline preview invalidated by composition on project load.
Related to
#1266
parent
bfbff817
Pipeline
#148131
passed with stage
in 5 minutes and 25 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/mainwindow.cpp
View file @
58d2b03f
...
...
@@ -2352,6 +2352,8 @@ void MainWindow::connectDocument()
// Load master effect zones
getMainTimeline
()
->
controller
()
->
updateMasterZones
(
getMainTimeline
()
->
controller
()
->
getModel
()
->
getMasterEffectZones
());
// Connect stuff for timeline preview
connect
(
getMainTimeline
()
->
controller
()
->
getModel
().
get
(),
&
TimelineModel
::
invalidateZone
,
getMainTimeline
()
->
controller
(),
&
TimelineController
::
invalidateZone
,
Qt
::
DirectConnection
);
m_buttonSelectTool
->
setChecked
(
true
);
connect
(
m_projectMonitorDock
,
&
QDockWidget
::
visibilityChanged
,
m_projectMonitor
,
&
Monitor
::
slotRefreshMonitor
,
Qt
::
UniqueConnection
);
...
...
src/timeline2/view/timelinecontroller.cpp
View file @
58d2b03f
...
...
@@ -123,7 +123,6 @@ void TimelineController::setModel(std::shared_ptr<TimelineItemModel> model)
connect
(
this
,
&
TimelineController
::
videoTargetChanged
,
this
,
&
TimelineController
::
updateVideoTarget
);
connect
(
this
,
&
TimelineController
::
audioTargetChanged
,
this
,
&
TimelineController
::
updateAudioTarget
);
connect
(
m_model
.
get
(),
&
TimelineItemModel
::
requestMonitorRefresh
,
[
&
]()
{
pCore
->
requestMonitorRefresh
();
});
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
,
&
TimelineController
::
showMixModel
);
...
...
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