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 fixed one other instances of this error. (cherry picked from commit c7a1e81) Refs #10359
MythTV · Apr 8, 2012 · 08dffd4 · 08dffd4
1 parent 91a06b9
commit 08dffd4
Show file tree

Hide file tree

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

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