Fix selected index in effect stack

diff --git a/src/effectstack/collapsibleeffect.cpp b/src/effectstack/collapsibleeffect.cpp
index edc7421bfe1f57824a33fb5efe987514acf6a1c4..5e459c2990f810302609f689cce7ffeab796ec97 100644 (file)
--- a/src/effectstack/collapsibleeffect.cpp
+++ b/src/effectstack/collapsibleeffect.cpp
@@ -291,7 +291,7 @@ void CollapsibleEffect::mouseDoubleClickEvent ( QMouseEvent * event )
 
 void CollapsibleEffect::mousePressEvent ( QMouseEvent *event )
 {
-    if (!m_active && m_paramWidget) emit activateEffect(m_paramWidget->index());
+    if (!m_active && m_paramWidget) emit activateEffect(effectIndex());
     QWidget::mousePressEvent(event);
 }
 

diff --git a/src/effectstack/effectstackview2.cpp b/src/effectstack/effectstackview2.cpp
index 56a9b330736f6103d96c761e07e3a69bf1f95d72..4aa4d4ef66404278b843d6871c92efcb939edc0a 100644 (file)
--- a/src/effectstack/effectstackview2.cpp
+++ b/src/effectstack/effectstackview2.cpp
@@ -219,6 +219,7 @@ void EffectStackView2::setupListView(int ix)
        } else {
            vbox1->addWidget(currentEffect);
        }
+       if (currentEffect->effectIndex() == ix) currentEffect->setActive(true);
 
        // Check drag & drop
        currentEffect->installEventFilter( this );
@@ -412,7 +413,7 @@ void EffectStackView2::slotSetCurrentEffect(int ix)
     if (m_clipref && ix != m_clipref->selectedEffectIndex())
         m_clipref->setSelectedEffect(ix);
     for (int i = 0; i < m_effects.count(); i++) {
-        m_effects.at(i)->setActive(i == ix);
+        m_effects.at(i)->setActive(m_effects.at(i)->effectIndex() == ix);
     }
 }