Permalink
Browse files

[pvr] fixed deadlock in CPVRManager::CheckParentalLock when the manag…

…er is being stopped
  • Loading branch information...
1 parent 02f2a4d commit 2d221752d3053f070a3f8fde6394190da24affde @opdenkamp opdenkamp committed Dec 31, 2012
Showing with 3 additions and 0 deletions.
  1. +3 −0 xbmc/pvr/PVRManager.cpp
View
@@ -759,6 +759,9 @@ bool CPVRManager::CheckParentalLock(const CPVRChannel &channel)
bool CPVRManager::IsParentalLocked(const CPVRChannel &channel)
{
bool bReturn(false);
+ CSingleLock lock(m_managerStateMutex);
+ if (!IsStarted())
+ return bReturn;
CPVRChannelPtr currentChannel(new CPVRChannel(false));
if (// different channel

0 comments on commit 2d22175

Please sign in to comment.