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
b1ab1979
Commit
b1ab1979
authored
Dec 14, 2021
by
Jean-Baptiste Mardelle
Browse files
Fix concurrency crash with autosave and multicam mode
parent
7c96bd22
Changes
2
Show whitespace changes
Inline
Side-by-side
src/core.cpp
View file @
b1ab1979
...
...
@@ -1098,7 +1098,7 @@ bool Core::enableMultiTrack(bool enable)
}
bool
isMultiTrack
=
pCore
->
monitorManager
()
->
isMultiTrack
();
if
(
isMultiTrack
||
enable
)
{
pCore
->
window
()
->
getMainTimeline
()
->
controller
()
->
slotMultitrackView
(
enable
,
enabl
e
);
pCore
->
window
()
->
getMainTimeline
()
->
controller
()
->
slotMultitrackView
(
enable
,
tru
e
);
return
true
;
}
return
false
;
...
...
src/timeline2/view/timelinecontroller.cpp
View file @
b1ab1979
...
...
@@ -4144,6 +4144,10 @@ bool TimelineController::exists(int itemId)
void
TimelineController
::
slotMultitrackView
(
bool
enable
,
bool
refresh
)
{
QStringList
trackNames
=
TimelineFunctions
::
enableMultitrackView
(
m_model
,
enable
,
refresh
);
if
(
!
refresh
)
{
// This is just a temporary state (disable multitrack view for playlist save, don't change scene
return
;
}
pCore
->
monitorManager
()
->
projectMonitor
()
->
slotShowEffectScene
(
enable
?
MonitorSplitTrack
:
MonitorSceneNone
,
false
,
QVariant
(
trackNames
));
QObject
::
disconnect
(
m_connection
);
if
(
enable
)
{
...
...
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