From 21ffbc4d5c95f174860ee72b041751a51158b120 Mon Sep 17 00:00:00 2001 From: Menno Date: Fri, 27 Feb 2015 14:33:37 +0100 Subject: [PATCH] First check if allowfiledeletion is true before prompting for master password. --- xbmc/video/dialogs/GUIDialogVideoInfo.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp index 073c6955bdef3..0bf0e9421350f 100644 --- a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp +++ b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp @@ -1240,10 +1240,10 @@ bool CGUIDialogVideoInfo::DeleteVideoItem(const CFileItemPtr &item, bool unavail return false; // check if the user is allowed to delete the actual file as well - if ((CProfilesManager::Get().GetCurrentProfile().getLockMode() == LOCK_MODE_EVERYONE || + if (CSettings::Get().GetBool("filelists.allowfiledeletion") && + (CProfilesManager::Get().GetCurrentProfile().getLockMode() == LOCK_MODE_EVERYONE || !CProfilesManager::Get().GetCurrentProfile().filesLocked() || - g_passwordManager.IsMasterLockUnlocked(true)) && - CSettings::Get().GetBool("filelists.allowfiledeletion")) + g_passwordManager.IsMasterLockUnlocked(true))) { std::string strDeletePath = item->GetVideoInfoTag()->GetPath();