From: Ed Rogalsky <ed.rogalsky@googlemail.com>
Date: Thu, 22 Nov 2012 10:17:18 +0000 (+0100)
Subject: Merge branch 'master' into bugfix/jogshuttle
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=27bd91107e757db52b4b9b00ef0b8f262839043d;hp=ef18c87989e06fb13f0998771cbc116566468016;p=kdenlive

Merge branch 'master' into bugfix/jogshuttle
---

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f9d5900b..0a249188 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3925,24 +3925,39 @@ void MainWindow::loadClipActions()
 		Mlt::Profile profile;
 		Mlt::Filter *filter = Mlt::Factory::filter(profile,(char*)"videostab");
 		if (filter) {
-			delete filter;
-			QAction *action=actionMenu->addAction(i18n("Stabilize (vstab)"));
-			action->setData("videostab");
-			connect(action,SIGNAL(triggered()), this, SLOT(slotStartClipAction()));
+			if (!filter->is_valid()) {
+			    delete filter;
+			}
+			else {
+			    delete filter;
+			    QAction *action=actionMenu->addAction(i18n("Stabilize (vstab)"));
+			    action->setData("videostab");
+			    connect(action,SIGNAL(triggered()), this, SLOT(slotStartClipAction()));
+			}
 		}
 		filter = Mlt::Factory::filter(profile,(char*)"videostab2");
 		if (filter) {
-			delete filter;
-			QAction *action=actionMenu->addAction(i18n("Stabilize (transcode)"));
-			action->setData("videostab2");
-			connect(action,SIGNAL(triggered()), this, SLOT(slotStartClipAction()));
+			if (!filter->is_valid()) {
+			    delete filter;
+			}
+			else {
+			    delete filter;
+			    QAction *action=actionMenu->addAction(i18n("Stabilize (transcode)"));
+			    action->setData("videostab2");
+			    connect(action,SIGNAL(triggered()), this, SLOT(slotStartClipAction()));
+			}
 		}
 		filter = Mlt::Factory::filter(profile,(char*)"motion_est");
 		if (filter) {
-			delete filter;
-			QAction *action=actionMenu->addAction(i18n("Automatic scene split"));
-			action->setData("motion_est");
-			connect(action,SIGNAL(triggered()), this, SLOT(slotStartClipAction()));
+			if (!filter->is_valid()) {
+			    delete filter;
+			}
+			else {
+			    delete filter;
+			    QAction *action=actionMenu->addAction(i18n("Automatic scene split"));
+			    action->setData("motion_est");
+			    connect(action,SIGNAL(triggered()), this, SLOT(slotStartClipAction()));
+			}
 		}
 	}