Ticket #4666: mythtv_tv_play_deleteLater.diff

libs/libmythtv/tv_play.h

@@ -118 +118 @@
     };
 
     TV(void);
-   ~TV();
+   ~TV(); // Use deleteLater() instead of delete
 
     bool Init(bool createWindow = true);
 
@@ -225 +225 @@
     void ToggleMute(void);
 
   public slots:
+    void deleteLater(void);
     void HandleOSDClosed(int osdType);
 
   protected slots:
@@ -238 +239 @@
     void TreeMenuSelected(OSDListTreeType *tree, OSDGenericTree *item);
 
   protected:
+    void Teardown(void);
     void doEditSchedule(int editType = kScheduleProgramGuide);
     static void *RecordedShowMenuHandler(void *param);
     static void *ViewScheduledMenuHandler(void *param);

libs/libmythtv/tv_play.cpp

@@ -103 +103 @@
     {
         VERBOSE(VB_IMPORTANT, "Experienced fatal error:"
                 "Failed initializing TV");
-        delete tv;
+        tv->deleteLater();
+        tv = NULL;
         return false;
     }
 
@@ -233 +234 @@
     
     bool allowrerecord = tv->getAllowRerecord();
     bool deleterecording = tv->getRequestDelete();
-    
-    delete tv;
-    
+
+    tv->deleteLater();
+    tv = NULL;
+
     if (curProgram)
     {
         if (deleterecording)
@@ -739 +741 @@
 
 TV::~TV(void)
 {
+     Teardown();
+}
+ 
+void TV::deleteLater(void)
+{
+     Teardown();
+     QObject::deleteLater();
+}
+ 
+void TV::Teardown(void)
+{
     QMutexLocker locker(&osdlock); // prevent UpdateOSDSignal from continuing.
+
+    if (!runMainLoop)
+        return;
+
     gContext->removeListener(this);
     gContext->removeCurrentLocation();
 

programs/mythfrontend/manualbox.cpp

@@ -193 +193 @@
     {
         m_tv->StopEmbeddingOutput();
         qApp->unlock();
-        delete m_tv;
+        m_tv->deleteLater();
         qApp->lock();
         m_tv = NULL;
     }
@@ -210 +210 @@
         {
             VERBOSE(VB_IMPORTANT, "Experienced fatal error initialzing "
                     "TV class in ManualBox::startPlayer().");
-            delete m_tv;
-            m_tv = 0;
+            m_tv->deleteLater();
+            m_tv = NULL;
             tvstarting = false;
             return;
         }
@@ -234 +234 @@
         else
         {
             qApp->unlock();
-            delete m_tv;
+            m_tv->deleteLater();
             qApp->lock();
             m_tv = NULL;
             emit dismissWindow();

programs/mythtv/main.cpp

@@ -273 +273 @@
     if (!tv->Init())
     {
         VERBOSE(VB_IMPORTANT, "Fatal Error: Could not initializing TV class.");
+        tv->deleteLater();
         return TV_EXIT_NO_TV;
     }
 
@@ -293 +294 @@
 
     TV::StartTV(pginfo, false);
 
+    tv->deleteLater();
+
     if (pginfo)
         delete pginfo;