Protect the MythUIType destructor to prevent it being called incorrec…

…tly. Refs #10807 Signed-off-by: Stuart Morgan <smorgan@mythtv.org>
MythTV · Jun 6, 2012 · 36364d1 · 36364d1
1 parent c9497cb
commit 36364d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mythtv/libs/libmythtv/subtitlescreen.cpp b/mythtv/libs/libmythtv/subtitlescreen.cpp
@@ -167,7 +167,7 @@ SubtitleFormat::~SubtitleFormat(void)
     for (int i = 0; i < m_cleanup.size(); ++i)
     {
         m_cleanup[i]->DeleteAllChildren();
-        delete m_cleanup[i];
+        m_cleanup[i]->deleteLater();
         m_cleanup[i] = NULL; // just to be safe
     }
 }

diff --git a/mythtv/libs/libmythui/mythuitype.h b/mythtv/libs/libmythui/mythuitype.h
@@ -67,7 +67,6 @@ class MUI_PUBLIC MythUIType : public QObject, public XMLParseBase
 
   public:
     MythUIType(QObject *parent, const QString &name);
-    virtual ~MythUIType();
 
     virtual void Reset(void);
 
@@ -174,6 +173,7 @@ class MUI_PUBLIC MythUIType : public QObject, public XMLParseBase
     QMap<QString, QString> GetDependsMap() const { return m_dependsMap; }
 
   protected:
+    virtual ~MythUIType();
     virtual void customEvent(QEvent *);
 
   public slots: