diff options
author | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2019-09-01 11:35:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-01 11:35:48 +0200 |
commit | 05a2c2879810a9b8a375d31e9922300883104929 (patch) | |
tree | b6db60b6ace02d334895e2a4db1be43779a3eb11 | |
parent | 2bfbe71263b8b1987acdfcf68422f3e1d68a2c40 (diff) | |
parent | c7a9307565c76fd793a6ee87b0442d37173cc087 (diff) |
Merge pull request #16550 from ksooo/pvr-fix-shutdown-deadlock
[PVR] Fix deadlock on PVR shutdown.
-rw-r--r-- | xbmc/pvr/PVRManager.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp index 6b9ea7ae2b..d61a8ec99f 100644 --- a/xbmc/pvr/PVRManager.cpp +++ b/xbmc/pvr/PVRManager.cpp @@ -299,8 +299,6 @@ void CPVRManager::Start() // lock here (m_startStopMutex), which only gets hold while starting/restarting pvr manager. Stop(); - CSingleLock lock(m_critSection); - if (!m_addons->HasCreatedClients()) return; @@ -339,8 +337,6 @@ void CPVRManager::Stop(void) SetState(ManagerStateInterrupted); - CSingleLock lock(m_critSection); - UnloadComponents(); m_database->Close(); |