Fixes segfault on mythfrontend exit & related problems.

NetworkControl wasn't removing itself from the listener list when the object was deleted causing a segfault when an event was received during shutdown. Reviewed other instances of gCoreContext->addListener() and found two other instances of this error.
MythTV · Mar 30, 2012 · c7a1e81 · c7a1e81
1 parent c3eaf78
commit c7a1e81
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp
@@ -519,6 +519,8 @@ MythMainWindow::MythMainWindow(const bool useDB)
 
 MythMainWindow::~MythMainWindow()
 {
+    gCoreContext->removeListener(this);
+
     d->drawTimer->stop();
 
     while (!d->stackList.isEmpty())

diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp
@@ -295,6 +295,8 @@ void MainServer::Stop()
 {
     m_stopped = true;
 
+    gCoreContext->removeListener(this);
+
     {
         QMutexLocker locker(&masterFreeSpaceListLock);
         if (masterFreeSpaceListUpdater)

diff --git a/mythtv/programs/mythfrontend/networkcontrol.cpp b/mythtv/programs/mythfrontend/networkcontrol.cpp
@@ -221,6 +221,8 @@ NetworkControl::NetworkControl() :
 
 NetworkControl::~NetworkControl(void)
 {
+    gCoreContext->removeListener(this);
+
     clientLock.lock();
     while (!clients.isEmpty())
     {