- Blacklist bluescreen0r (we do not need 3 of them)

- cleanup

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

diff --git a/data/blacklisted_effects.txt b/data/blacklisted_effects.txt
index 9f132604dcbade13097548faa6628503f34b8617..20fb97ca9b9699a46742bfc8915b8bd9081f681c 100644 (file)
--- a/data/blacklisted_effects.txt
+++ b/data/blacklisted_effects.txt
@@ -8,6 +8,7 @@ frei0r.bw0r
 frei0r.flippo
 frei0r.invert0r
 frei0r.twolay0r
+frei0r.bluescreen0r
 
 # effects with XML UI
 frei0r.squareblur

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 89a980abd72cd2fbcea3155731f5e2b94629142a..06f088a3c9c5222a7f96da9011c2d99706930d77 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -55,8 +55,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget
         m_isActive(false),
         m_scale(1),
         m_length(0),
-        m_dragStarted(false),
-        m_delStage(false)
+        m_dragStarted(false)
 {
     m_ui.setupUi(this);
     QVBoxLayout *layout = new QVBoxLayout;
@@ -180,7 +179,6 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget
 
 Monitor::~Monitor()
 {
-    m_delStage = true;
     delete m_ruler;
     delete m_timePos;
     delete m_overlay;
@@ -839,7 +837,7 @@ QStringList Monitor::getZoneInfo() const
 
 void Monitor::slotEffectScene(bool show)
 {
-    if (m_name == "project" && !m_delStage) {
+    if (m_name == "project") {
 #ifdef Q_WS_MAC
         m_glWidget->setVisible(!show);
 #else

diff --git a/src/monitor.h b/src/monitor.h
index ecc2b7509250ee3e1d987fd4371da98bb09cbaa8..afdc611bffd723c25a9f5772d6b8f5c60da7b46b 100644 (file)
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -129,7 +129,6 @@ private:
     QPoint m_DragStartPosition;
     MonitorScene *m_effectScene;
     QGraphicsView *m_effectView;
-    bool m_delStage;
 #ifdef Q_WS_MAC
     VideoGLWidget *m_glWidget;
 #endif