From: Till Theato <root@ttill.de>
Date: Tue, 31 Aug 2010 18:52:06 +0000 (+0000)
Subject: Make on-monitor effect editing work with track effects
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=006c0771da016599fb7d331788bc72268f25401f;p=kdenlive

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 99e9a7a4..5a2d1fb9 100644
--- 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 787a4562..9cf791c6 100644
--- 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 {