media library: fix path history navigation #6108
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…tory path with the current directory path
Montellese
added
Type: Fix
|
I take it http://trac.kodi.tv/ticket/15668 would be fixed by this, could you check it out and maybe change the commit message(s) so it gets closed on merge? |
|
@Jalle19: Yes I was just too lazy to look for it ;-) |
Montellese
force-pushed
the
fix_media_library_navigation
branch
from
72272bc
to
52f388c
Compare
|
jenkins build this please |
Montellese
added a commit
that referenced
this pull request
Jan 7, 2015
media library: fix path history navigation
phil65
pushed a commit
to phil65/xbmc
that referenced
this pull request
Jan 10, 2015
…tion media library: fix path history navigation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes an issue introduced by #5941 (actually we were just lucky that it didn't hit us before) which broke path history navigation when e.g. jumping into a tvshow smartplaylist directly from the home screen as described by @HitcherUK in http://forum.kodi.tv/showthread.php?tid=211165&pid=1876847#pid1876847.
The issue basically is/was that we compared the original start path with the determined parent path and the determined parent path had a trailing slash whereas the original start path didn't. Furthermore the logic in
CGUIMediaWindow::SetHistoryForPath()always adds a trailing slash to all paths being stored in the path history. But that can result in invalid paths if the path was pointing to a file that is evaluated as a directory (e.g. XSP paths). We don't do that inCDirectoryHistory::AddPath()either so I fixed that as well.