aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmarshallnz <jcmarsha@gmail.com>2014-02-11 09:32:10 +1300
committerjmarshallnz <jcmarsha@gmail.com>2014-02-11 09:32:10 +1300
commit7e5e7652d56f91b939fb1bad82c4fe51725c9030 (patch)
tree0616886e96fcf0cad9abaee8e023926632547256
parent733f36bdabc91e8880ba87d0665715c073a2b79b (diff)
parentee12fa38c34934376883ea37ad9c01807e5e1ba1 (diff)
Merge pull request #4182 from Black09/delete-update-fix
Fixed: Update list if item was deleted from database but not from disk
-rw-r--r--xbmc/video/dialogs/GUIDialogVideoInfo.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp
index 03f1aa638c..17b24201cc 100644
--- a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp
+++ b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp
@@ -1306,7 +1306,6 @@ bool CGUIDialogVideoInfo::DeleteVideoItem(const CFileItemPtr &item, bool unavail
if (!DeleteVideoItemFromDatabase(item, unavailable))
return false;
- bool result = true;
// check if the user is allowed to delete the actual file as well
if ((CProfilesManager::Get().GetCurrentProfile().getLockMode() == LOCK_MODE_EVERYONE ||
!CProfilesManager::Get().GetCurrentProfile().filesLocked() ||
@@ -1335,13 +1334,13 @@ bool CGUIDialogVideoInfo::DeleteVideoItem(const CFileItemPtr &item, bool unavail
// HACK: stacked files need to be treated as folders in order to be deleted
if (item->IsStack())
item->m_bIsFolder = true;
- result = CFileUtils::DeleteItem(item);
+ CFileUtils::DeleteItem(item);
}
}
CUtil::DeleteVideoDatabaseDirectoryCache();
- return result;
+ return true;
}
bool CGUIDialogVideoInfo::ManageMovieSets(const CFileItemPtr &item)