Commit b1ab1979 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Fix concurrency crash with autosave and multicam mode

parent 7c96bd22
...@@ -1098,7 +1098,7 @@ bool Core::enableMultiTrack(bool enable) ...@@ -1098,7 +1098,7 @@ bool Core::enableMultiTrack(bool enable)
} }
bool isMultiTrack = pCore->monitorManager()->isMultiTrack(); bool isMultiTrack = pCore->monitorManager()->isMultiTrack();
if (isMultiTrack || enable) { if (isMultiTrack || enable) {
pCore->window()->getMainTimeline()->controller()->slotMultitrackView(enable, enable); pCore->window()->getMainTimeline()->controller()->slotMultitrackView(enable, true);
return true; return true;
} }
return false; return false;
......
...@@ -4144,6 +4144,10 @@ bool TimelineController::exists(int itemId) ...@@ -4144,6 +4144,10 @@ bool TimelineController::exists(int itemId)
void TimelineController::slotMultitrackView(bool enable, bool refresh) void TimelineController::slotMultitrackView(bool enable, bool refresh)
{ {
QStringList trackNames = TimelineFunctions::enableMultitrackView(m_model, enable, 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)); pCore->monitorManager()->projectMonitor()->slotShowEffectScene(enable ? MonitorSplitTrack : MonitorSceneNone, false, QVariant(trackNames));
QObject::disconnect( m_connection ); QObject::disconnect( m_connection );
if (enable) { if (enable) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment