[Kdenlive-svn] [kdenlive/v0.9] src: Fix Coverity #980697

[Jean-Baptiste M. <jb...@kd...>]

Git commit 008875086933d8e803607a28748230e4371d56cf by Jean-Baptiste Mardelle.
Committed on 12/02/2013 at 00:26.
Pushed by mardelle into branch 'v0.9'.

Fix Coverity #980697

M  +17   -15   src/monitor.cpp
M  +0    -1    src/monitor.h

http://commits.kde.org/kdenlive/008875086933d8e803607a28748230e4371d56cf

diff --git a/src/monitor.cpp b/src/monitor.cpp
index f985519..9763f6a 100644
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -47,21 +47,23 @@
 
 
 Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profile, QWidget *parent) :
-    AbstractMonitor(id, manager, parent),
-    render(NULL),
-    m_currentClip(NULL),
-    m_overlay(NULL),
-    m_scale(1),
-    m_length(2),
-    m_dragStarted(false),
-    m_contextMenu(NULL),
-    m_effectWidget(NULL),
-    m_selectedClip(NULL),
-    m_loopClipTransition(true),
+    AbstractMonitor(id, manager, parent)
+    , render(NULL)
+    , m_name(Kdenlive::noMonitor)
+    , m_currentClip(NULL)
+    , m_overlay(NULL)
+    , m_scale(1)
+    , m_length(2)
+    , m_dragStarted(false)
+    , m_loopClipAction(NULL)
+    , m_contextMenu(NULL)
+    , m_effectWidget(NULL)
+    , m_selectedClip(NULL)
+    , m_loopClipTransition(true)
 #ifdef USE_OPENGL
-    m_glWidget(NULL),
+    , m_glWidget(NULL)
 #endif
-    m_editMarker(NULL)
+    , m_editMarker(NULL)
 {
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setContentsMargins(0, 0, 0, 0);
@@ -1037,10 +1039,10 @@ QStringList Monitor::getZoneInfo() const
 void Monitor::slotSetSelectedClip(AbstractClipItem* item)
 {
     if (item) {
-        m_loopClipAction->setEnabled(true);
+        if (m_loopClipAction) m_loopClipAction->setEnabled(true);
         m_selectedClip = item;
     } else {
-        m_loopClipAction->setEnabled(false);
+        if (m_loopClipAction) m_loopClipAction->setEnabled(false);
     }
 }
 
diff --git a/src/monitor.h b/src/monitor.h
index 4f11dc5..0658ca5 100644
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -141,7 +141,6 @@ private:
     QMenu *m_markerMenu;
     QPoint m_DragStartPosition;
     MonitorEditWidget *m_effectWidget;
-    VideoContainer *m_videoBox;
     /** Selected clip/transition in timeline. Used for looping it. */
     AbstractClipItem *m_selectedClip;
     /** true if selected clip is transition, false = selected clip is clip.