Make sure we delete RAOP device in the thread that started it.

Fixes occasional crash at shutdown
MythTV · Jun 18, 2013 · e1773c2 · e1773c2
1 parent 9b22dab
commit e1773c2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp b/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp
@@ -55,6 +55,9 @@ bool MythRAOPDevice::Create(void)
         QObject::connect(
             gMythRAOPDeviceThread->qthread(), SIGNAL(started()),
             gMythRAOPDevice,                  SLOT(Start()));
+        QObject::connect(
+            gMythRAOPDeviceThread->qthread(), SIGNAL(finished()),
+            gMythRAOPDevice,                  SLOT(Stop()));
         gMythRAOPDeviceThread->start(QThread::LowestPriority);
     }
 
@@ -67,9 +70,6 @@ void MythRAOPDevice::Cleanup(void)
 {
     LOG(VB_GENERAL, LOG_INFO, LOC + "Cleaning up.");
 
-    if (gMythRAOPDevice)
-        gMythRAOPDevice->Teardown();
-
     QMutexLocker locker(gMythRAOPDeviceMutex);
     if (gMythRAOPDeviceThread)
     {
@@ -92,8 +92,6 @@ MythRAOPDevice::MythRAOPDevice()
 
 MythRAOPDevice::~MythRAOPDevice()
 {
-    Teardown();
-
     delete m_lock;
     m_lock = NULL;
 }
@@ -149,6 +147,11 @@ void MythRAOPDevice::Start(void)
     return;
 }
 
+void MythRAOPDevice::Stop(void)
+{
+    Teardown();
+}
+
 bool MythRAOPDevice::RegisterForBonjour(void)
 {
     // announce service

diff --git a/mythtv/libs/libmythtv/AirPlay/mythraopdevice.h b/mythtv/libs/libmythtv/AirPlay/mythraopdevice.h
@@ -30,6 +30,7 @@ class MTV_PUBLIC MythRAOPDevice : public ServerPool
 
   private slots:
     void Start();
+    void Stop();
     void newConnection(QTcpSocket *client);
     void deleteClient();