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

Already on GitHub? Sign in to your account

Make CFileItem find the mimetime for a PVR Channel #1489

Merged
merged 1 commit into from Oct 2, 2012

Conversation

Projects
None yet
3 participants
Contributor

BtbN commented Sep 27, 2012

Just a small check missing in FileItem.cpp CFileItem::GetMimeType.
Without the libXBMC changes this time.

Owner

Montellese commented Sep 27, 2012

For the future you don't need to create a new PR if you change something (in this case remove the second commit). You can make your changes in the same branch and then force push it to your github repository and it will automatically show up in the PR.

Contributor

BtbN commented Sep 27, 2012

Yeah, i tried that(doing it for the first time), and somehow managed to close the old PR instead to make the rebase show up in it, so i had to re-create it.

Owner

Montellese commented Oct 1, 2012

Uhm does removing the call to Trim() work in all cases? I can't test this but I guess you put it there for a reason so if you remove it from CFileItem::GetMimeType() you need to add it somewhere else or not?

Contributor

BtbN commented Oct 1, 2012

I mainly put it there cause the other paths of the function trimmed it, too. Don't see a reason why a trim should realy be necessary. If an Addon gives a malformed mimetype string that needs trimming, it should be fixed in the Addon.

Owner

Montellese commented Oct 1, 2012

Agreed. If you can squash the two commits into one, we can get it in for Frodo (october 10th is the deadline).

Contributor

BtbN commented Oct 1, 2012

Allright, should be sorted now.

@ghost ghost assigned opdenkamp Oct 1, 2012

@opdenkamp opdenkamp pushed a commit that referenced this pull request Oct 2, 2012

Lars Op den Kamp Merge pull request #1489 from BtbN/pvr_channel_mimetype
Make CFileItem find the mimetime for a PVR Channel
14dc4c8

@opdenkamp opdenkamp merged commit 14dc4c8 into xbmc:master Oct 2, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment