Fix a PreviewGenerator dtor race.

MythTV · Mar 12, 2012 · ff73126 · ff73126
1 parent 0542a10
commit ff73126
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/mythtv/libs/libmythtv/previewgenerator.cpp b/mythtv/libs/libmythtv/previewgenerator.cpp
@@ -327,8 +327,6 @@ void PreviewGenerator::run(void)
 {
     RunProlog();
     Run();
-    connect(qthread(), SIGNAL(finished()),
-            this, SLOT(deleteLater()));
     RunEpilog();
 }
 

diff --git a/mythtv/libs/libmythtv/previewgeneratorqueue.cpp b/mythtv/libs/libmythtv/previewgeneratorqueue.cpp
@@ -167,6 +167,7 @@ bool PreviewGeneratorQueue::event(QEvent *e)
                 return true;
             }
 
+            (*it).gen->deleteLater();
             (*it).gen           = NULL;
             (*it).genStarted    = false;
             if (me->Message() == "PREVIEW_SUCCESS")
@@ -473,9 +474,12 @@ void PreviewGeneratorQueue::SetPreviewGenerator(
         PreviewGenState &state = m_previewMap[key];
         if (state.gen)
         {
-            if (!g->GetToken().isEmpty())
-                state.tokens.insert(g->GetToken());
-            g->deleteLater();
+            if (state.gen != g)
+            {
+                if (!g->GetToken().isEmpty())
+                    state.tokens.insert(g->GetToken());
+                g->deleteLater();
+            }
         }
         else
         {