From 604434de173b7c8ad677fb5331a72dc4effd469e Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Tue, 12 Feb 2013 00:26:14 +0100 Subject: [PATCH] Fix Coverity #980697 --- src/monitor.cpp | 32 +++++++++++++++++--------------- src/monitor.h | 1 - 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/monitor.cpp b/src/monitor.cpp index f9855190..9763f6ae 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 4f11dc58..0658ca5d 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. -- 2.39.2