Fix memory leak.

Screens for registered clients weren't deleted in MythUINotificationCenter destructor. Leak wouldn't only have existed when frontend exited
MythTV · Jul 8, 2013 · 3cee24d · 3cee24d
1 parent cf093aa
commit 3cee24d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/mythtv/libs/libmythui/mythuinotificationcenter.cpp b/mythtv/libs/libmythui/mythuinotificationcenter.cpp
@@ -519,6 +519,7 @@ MythUINotificationCenter::~MythUINotificationCenter()
 
     QMutexLocker lock(&m_lock);
 
+    DeleteAllRegistrations();
     DeleteAllScreens();
 
     // Delete all outstanding queued notifications
@@ -829,6 +830,18 @@ MythNotificationScreenStack *MythUINotificationCenter::GetScreenStack(void)
     return m_screenStack;
 }
 
+void MythUINotificationCenter::DeleteAllRegistrations(void)
+{
+    QMap<int, MythUINotificationScreen*>::iterator it = m_registrations.begin();
+
+    for (; it != m_registrations.end();)
+    {
+        m_deletedScreens.append(*it);
+        it = m_registrations.erase(it);
+    }
+    m_registrations.clear();
+}
+
 void MythUINotificationCenter::DeleteAllScreens(void)
 {
     // delete all screens waiting to be deleted

diff --git a/mythtv/libs/libmythui/mythuinotificationcenter.h b/mythtv/libs/libmythui/mythuinotificationcenter.h
@@ -118,6 +118,7 @@ private slots:
                                            int id = -1);
     MythNotificationScreenStack *GetScreenStack(void);
     void ScreenStackDeleted(void);
+    void DeleteAllRegistrations(void);
     void DeleteAllScreens(void);
     int InsertScreen(MythUINotificationScreen *screen);
     int RemoveScreen(MythUINotificationScreen *screen);