pvr: fix segfault on exit

xbmc · Dec 21, 2016 · 29c2243 · 29c2243
1 parent 509070a
commit 29c2243
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp
@@ -78,7 +78,7 @@ using KODI::MESSAGING::HELPERS::DialogResponse;
 
 CPVRManagerJobQueue::CPVRManagerJobQueue()
 : m_triggerEvent(false),
-m_bStopped(true)
+  m_bStopped(true)
 {
 }
 
@@ -170,6 +170,8 @@ CPVRManager::CPVRManager(void) :
 
 CPVRManager::~CPVRManager(void)
 {
+  m_addons.reset();
+
   CServiceBroker::GetSettings().UnregisterCallback(this);
   CAnnouncementManager::GetInstance().RemoveAnnouncer(this);
   CLog::Log(LOGDEBUG,"PVRManager - destroyed");

diff --git a/xbmc/pvr/PVRManager.h b/xbmc/pvr/PVRManager.h
@@ -673,7 +673,7 @@ namespace PVR
     CPVRChannelGroupsContainerPtr  m_channelGroups;               /*!< pointer to the channel groups container */
     CPVRRecordingsPtr              m_recordings;                  /*!< pointer to the recordings container */
     CPVRTimersPtr                  m_timers;                      /*!< pointer to the timers container */
-    const CPVRClientsPtr           m_addons;                      /*!< pointer to the pvr addon container */
+    CPVRClientsPtr                 m_addons;                      /*!< pointer to the pvr addon container */
     std::unique_ptr<CPVRGUIInfo>   m_guiInfo;                     /*!< pointer to the guiinfo data */
     //@}