diff options
| author | Chris Browet <koying@semperpax.com> | 2014-06-01 11:18:53 +0200 |
|---|---|---|
| committer | Trent Nelson <trent.nelson@pivosgroup.com> | 2014-06-07 13:28:11 +0800 |
| commit | c4ef10a6b2516f235aa9818487667f716305d5bb (patch) | |
| tree | b8f86e1606974e5105706094ee76723fcbd072b7 | |
| parent | 78bd60fa14d5eab3b1453f4144ba1c79f6c43a5a (diff) | |
Merge pull request #4754 from koying/fixsetsdelete
FIX: [sets] actually allow to delete sets
| -rw-r--r-- | xbmc/video/dialogs/GUIDialogVideoInfo.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp index 3da6886c93..78a0515dd2 100644 --- a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp +++ b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp @@ -1202,6 +1202,7 @@ bool CGUIDialogVideoInfo::CanDeleteVideoItem(const CFileItemPtr &item) return params.GetMovieId() != -1 || params.GetEpisodeId() != -1 || params.GetMVideoId() != -1 || + params.GetSetId() != -1 || (params.GetTvShowId() != -1 && params.GetSeason() <= -1 && !CVideoDatabaseDirectory::IsAllItem(item->GetPath())); } @@ -1239,6 +1240,9 @@ bool CGUIDialogVideoInfo::DeleteVideoItemFromDatabase(const CFileItemPtr &item, case VIDEODB_CONTENT_MUSICVIDEOS: heading = 20392; break; + case VIDEODB_CONTENT_MOVIE_SETS: + heading = 646; + break; default: return false; @@ -1262,10 +1266,16 @@ bool CGUIDialogVideoInfo::DeleteVideoItemFromDatabase(const CFileItemPtr &item, if (!pDialog->IsConfirmed()) return false; - CStdString path; CVideoDatabase database; database.Open(); + if (type == VIDEODB_CONTENT_MOVIE_SETS) + { + database.DeleteSet(item->GetVideoInfoTag()->m_iDbId); + return true; + } + + CStdString path; database.GetFilePathById(item->GetVideoInfoTag()->m_iDbId, path, type); if (path.empty()) return false; |