From 169e417816c58424d82a47d26e1a851304781ea4 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Tue, 12 Feb 2013 00:41:24 +0100 Subject: [PATCH] Fix Coverity #980692 --- src/dvdwizard.cpp | 13 +++++++------ src/dvdwizard.h | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp index eb0b87fb..8caf7950 100644 --- a/src/dvdwizard.cpp +++ b/src/dvdwizard.cpp @@ -41,10 +41,11 @@ DvdWizard::DvdWizard(MonitorManager *manager, const QString &url, QWidget *parent) : - QWizard(parent), - m_dvdauthor(NULL), - m_mkiso(NULL), - m_burnMenu(new QMenu(this)) + QWizard(parent) + , m_dvdauthor(NULL) + , m_mkiso(NULL) + , m_vobitem(NULL) + , m_burnMenu(new QMenu(this)) { setWindowTitle(i18n("DVD Wizard")); //setPixmap(QWizard::WatermarkPixmap, QPixmap(KStandardDirs::locate("appdata", "banner.png"))); @@ -687,14 +688,14 @@ void DvdWizard::slotProcessMenuStatus(int, QProcess::ExitStatus status) kDebug() << "/// RENDERING MENU vob crashed"; errorMessage(i18n("Rendering menu crashed")); QByteArray result = m_menuJob.readAllStandardError(); - m_vobitem->setIcon(KIcon("dialog-close")); + if (m_vobitem) m_vobitem->setIcon(KIcon("dialog-close")); m_status.error_log->append(result); m_status.error_box->setHidden(false); m_status.button_start->setEnabled(true); m_status.button_abort->setEnabled(false); return; } - m_vobitem->setIcon(KIcon("dialog-ok")); + if (m_vobitem) m_vobitem->setIcon(KIcon("dialog-ok")); processSpumux(); } diff --git a/src/dvdwizard.h b/src/dvdwizard.h index cfeba332..6806a34a 100644 --- a/src/dvdwizard.h +++ b/src/dvdwizard.h @@ -73,8 +73,8 @@ private: KTemporaryFile m_menuVideo; KTemporaryFile m_menuFinalVideo; KTemporaryFile m_menuImageBackground; - void cleanup(); QMenu *m_burnMenu; + void cleanup(); void errorMessage(const QString &text); void infoMessage(const QString &text); void processDvdauthor(QString menuMovieUrl = QString(), stringRectMap buttons = stringRectMap(), QStringList buttonsTarget = QStringList()); -- 2.39.2