[PVR] Fix timers thread start/stop, load/unload races.

xbmc/pvr/PVRManager.cpp

@@ -393,6 +393,7 @@ void CPVRManager::Stop()
 
  m_addons->Stop();
  m_pendingUpdates->Stop();
+ m_timers->Stop();
  m_epgContainer.Stop();
  m_guiInfo->Stop();
 
@@ -508,6 +509,7 @@ void CPVRManager::Process()
 
  m_guiInfo->Start();
  m_epgContainer.Start(true);
+ m_timers->Start();
  m_pendingUpdates->Start();
 
  SetState(ManagerStateStarted);

xbmc/pvr/timers/PVRTimers.cpp

@@ -101,24 +101,33 @@ bool CPVRTimers::Load()
  // load local timers from database
  bool bReturn = LoadFromDatabase();
 
- Update(); // update from clients
-
- CServiceBroker::GetPVRManager().EpgContainer().Events().Subscribe(this, &CPVRTimers::Notify);
- Create();
+ // update from clients
+ Update();
 
  return bReturn;
 }
 
 void CPVRTimers::Unload()
 {
- StopThread();
- CServiceBroker::GetPVRManager().EpgContainer().Events().Unsubscribe(this);
-
  // remove all tags
  CSingleLock lock(m_critSection);
  m_tags.clear();
 }
 
+void CPVRTimers::Start()
+{
+ Stop();
+
+ CServiceBroker::GetPVRManager().EpgContainer().Events().Subscribe(this, &CPVRTimers::Notify);
+ Create();
+}
+
+void CPVRTimers::Stop()
+{
+ StopThread();
+ CServiceBroker::GetPVRManager().EpgContainer().Events().Unsubscribe(this);
+}
+
 bool CPVRTimers::Update()
 {
  {

xbmc/pvr/timers/PVRTimers.h

@@ -68,6 +68,16 @@ namespace PVR
  CPVRTimers();
  ~CPVRTimers() override = default;
 
+ /**
+ * @brief start the timer update thread.
+ */
+ void Start();
+
+ /**
+ * @brief stop the timer update thread.
+ */
+ void Stop();
+
  /**
  * @brief (re)load the timers from the clients.
  * @return True if loaded successfully, false otherwise.