Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix *All Albums item removed by Coverity fix #15155

Merged
merged 1 commit into from Jan 2, 2019

Conversation

@DaveTBlake
Copy link
Member

commented Dec 29, 2018

In the Coverity fixes of #14273 the addition of *All Albums item was broken for child nodes of NODE_TYPE_ALBUM type

When navigating the music library such as Genres > [specific genre] > *All Artists, this PR restores the *All Albums item to the resulting list of albums, providing "Show All Items" setting is enabled.

@@ -67,7 +67,6 @@ void CMusicFileItemListModifier::AddQueuingFolder(CFileItemList& items)
// All album related nodes
case NODE_TYPE_ALBUM:
if (directoryNode->GetType() == NODE_TYPE_OVERVIEW) return;
break;

This comment has been minimized.

Copy link
@garbear

garbear Dec 29, 2018

Member

I like to add the comment // No break so no one is confused later.

This comment has been minimized.

Copy link
@davilla

davilla Dec 29, 2018

Contributor

maybe not hide the 'return' at the eol would also help :)

This comment has been minimized.

Copy link
@DaveTBlake

DaveTBlake Dec 30, 2018

Author Member

As it is this change just removes the line that I added which broke things, restoring the code to how it had been for years seems the clearest fix.

But Coverity won't like this bit of code again, and I am happy to rework this module to the prefered current layout standards and so that Coverity is happy too in a follow up PR.

@DaveTBlake

This comment has been minimized.

Copy link
Member Author

commented Dec 30, 2018

jenkins build this please

@DaveTBlake DaveTBlake merged commit 292116d into xbmc:master Jan 2, 2019

1 check passed

default You're awesome. Have a cookie
Details

@DaveTBlake DaveTBlake deleted the DaveTBlake:FixAllAlbums branch Jan 2, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.