Fix clip monitor not correctly updating on some focus change

parent cb87721d
......@@ -1255,8 +1255,9 @@ void Monitor::start()
void Monitor::slotRefreshMonitor(bool visible)
{
if (visible) {
slotActivateMonitor();
start();
if (slotActivateMonitor()) {
start();
}
}
}
......@@ -1376,7 +1377,9 @@ void Monitor::slotOpenClip(std::shared_ptr<ProjectClip> controller, int in, int
m_glMonitor->setAudioThumb();
m_audioMeterWidget->audioChannels = 0;
}
slotActivateMonitor();
if (slotActivateMonitor()) {
start();
}
checkOverlay();
}
......@@ -1754,8 +1757,9 @@ void Monitor::warningMessage(const QString &text, int timeout, const QList<QActi
void Monitor::activateSplit()
{
loadQmlScene(MonitorSceneSplit);
slotActivateMonitor();
start();
if (slotActivateMonitor()) {
start();
}
}
void Monitor::slotSwitchCompare(bool enable)
......@@ -1784,8 +1788,9 @@ void Monitor::slotSwitchCompare(bool enable)
delete m_splitEffect;
m_splitEffect = nullptr;
loadQmlScene(MonitorSceneDefault);
slotActivateMonitor();
start();
if (slotActivateMonitor()) {
start();
}
return;
}
......
......@@ -1347,7 +1347,7 @@ bool TimelineController::insertZone(const QString &binId, QPoint zone, bool over
}
int insertPoint;
QPoint sourceZone;
if (KdenliveSettings::useTimelineZoneToEdit()) {
if (KdenliveSettings::useTimelineZoneToEdit() && m_zone != QPoint()) {
// We want to use timeline zone for in/out insert points
insertPoint = m_zone.x();
sourceZone = QPoint(zone.x(), zone.x() + m_zone.y() - m_zone.x());
......
......@@ -299,6 +299,8 @@ public:
/* @brief returns the frame currently processed by timeline preview, -1 if none
*/
int workingPreview() const;
/** @brief Return true if we want to use timeline ruler zone for editing */
bool useRuler() const;
/* @brief Load timeline preview from saved doc
*/
......
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