Merge pull request #4393 from xhaggi/fix-channel-manager-masterlock
authorjmarshallnz <jcmarsha@gmail.com>
Tue, 11 Mar 2014 02:16:34 +0000 (15:16 +1300)
committerJonathan Marshall <jmarshall@xbmc.org>
Tue, 11 Mar 2014 04:14:25 +0000 (17:14 +1300)
[pvr] fix: password prompt appears twice if set icon in channel manager

xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp

index 7b623a9..5f70aa0 100644 (file)
@@ -312,8 +312,6 @@ bool CGUIDialogPVRChannelManager::OnClickButtonChannelLogo(CGUIMessage &message)
     return false;
   if (CProfilesManager::Get().GetCurrentProfile().canWriteSources() && !g_passwordManager.IsProfileLockUnlocked())
     return false;
-  else if (!g_passwordManager.IsMasterLockUnlocked(true))
-    return false;
 
   // setup our thumb list
   CFileItemList items;