Make on-monitor effect editing work with track effects

svn path=/trunk/kdenlive/; revision=4800

diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp
index 99e9a7a4716562925dca097e131b77463905ab06..5a2d1fb9da366e6b85060943c7c9f251a12973b5 100644 (file)
--- a/src/effectstackview.cpp
+++ b/src/effectstackview.cpp
@@ -444,8 +444,7 @@ void EffectStackView::slotCheckAll(int state)
 
 void EffectStackView::slotCheckMonitorPosition(int renderPos)
 {
-    if (m_trackMode) return;
-    if (renderPos >= m_clipref->startPos().frames(KdenliveSettings::project_fps()) && renderPos <= m_clipref->endPos().frames(KdenliveSettings::project_fps())) {
+    if (m_trackMode || (renderPos >= m_clipref->startPos().frames(KdenliveSettings::project_fps()) && renderPos <= m_clipref->endPos().frames(KdenliveSettings::project_fps()))) {
         if (!m_monitor->getEffectScene()->views().at(0)->isVisible())
             m_monitor->slotEffectScene(true);
     } else {

diff --git a/src/geometrywidget.cpp b/src/geometrywidget.cpp
index 787a4562e0588eb026ef781f321bec6f9b66dcb6..9cf791c6d791e0bd02a796332493517e7367b9c7 100644 (file)
--- a/src/geometrywidget.cpp
+++ b/src/geometrywidget.cpp
@@ -190,7 +190,7 @@ void GeometryWidget::setupParam(const QDomElement elem, int minframe, int maxfra
         m_geometry = new Mlt::Geometry(tmp, maxframe - minframe, m_monitor->render->renderWidth(), m_monitor->render->renderHeight());
     delete[] tmp;
 
-    if (elem.attribute("fixed") == "1") {
+    if (elem.attribute("fixed") == "1" || maxframe < minframe) {
         // Keyframes are disabled
         m_ui.widgetTimeWrapper->setHidden(true);
     } else {