Commit 76a91c65 authored by Till Theato's avatar Till Theato

Fix monitor scene not showing up when switching between effects in effect stack

svn path=/trunk/kdenlive/; revision=4774
parent 47924e6c
......@@ -260,6 +260,8 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in
} else if (type == "geometry") {
if (KdenliveSettings::on_monitor_effects()) {
GeometryWidget *geometry = new GeometryWidget(m_monitor, m_timecode, pos, isEffect, this);
// connect this before setupParam to make sure the monitor scene shows up at startup
connect(geometry, SIGNAL(checkMonitorPosition(int)), this, SIGNAL(checkMonitorPosition(int)));
if (minFrame == maxFrame)
geometry->setupParam(pa, m_in, m_out);
else
......@@ -267,7 +269,6 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in
m_vbox->addWidget(geometry);
m_valueItems[paramName+"geometry"] = geometry;
connect(geometry, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters()));
connect(geometry, SIGNAL(checkMonitorPosition(int)), this, SIGNAL(checkMonitorPosition(int)));
connect(geometry, SIGNAL(seekToPos(int)), this, SIGNAL(seekTimeline(int)));
connect(this, SIGNAL(syncEffectsPos(int)), geometry, SLOT(slotSyncPosition(int)));
} else {
......
......@@ -444,7 +444,7 @@ void EffectStackView::slotCheckMonitorPosition(int renderPos)
void EffectStackView::slotRenderPos(int pos)
{
if (m_clipref && m_effectedit)
if (m_clipref && m_effectedit && !m_trackMode)
m_effectedit->slotSyncEffectsPos(pos - m_clipref->startPos().frames(KdenliveSettings::project_fps()));
}
......
......@@ -220,7 +220,6 @@ void GeometryWidget::setupParam(const QDomElement elem, int minframe, int maxfra
m_scene->addItem(m_rect);
slotPositionChanged(0, false);
slotUpdateProperties();
slotCheckMonitorPosition(m_monitor->render->seekFramePosition());
}
......
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