Fixes to effect deletion

svn path=/branches/KDE4/; revision=2329

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 6b315792132faf896808ac1f21c74e1b00032e23..ca3ea93fffa8071e0b37d572f914d059a96d40ec 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -719,7 +719,7 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) {
 
 void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) {
     QString index = effect.attribute("kdenlive_ix");
-    if (!m_document->renderer()->mltRemoveEffect(track, pos, index)) {
+    if (effect.attribute("disabled") != "1" && !m_document->renderer()->mltRemoveEffect(track, pos, index)) {
         emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
         return;
     }

diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp
index 36eb1f8afd7f736cad873ea03cae52ec69abee33..4c0b68891c0ca7ff2f7b498281cd6b3c5e09b07b 100644 (file)
--- a/src/effectstackview.cpp
+++ b/src/effectstackview.cpp
@@ -162,6 +162,7 @@ void EffectStackView::setupListView(int ix) {
         ui.buttonDown->setEnabled(false);
     } else {
         if (ix < 0) ix = 0;
+       if (ix > ui.effectlist->count() - 1) ix = ui.effectlist->count() - 1;
         ui.effectlist->setCurrentRow(ix);
         ui.buttonDel->setEnabled(true);
         ui.buttonSave->setEnabled(true);