aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Kaijser <machine.sanctum@gmail.com>2014-12-27 17:48:35 +0100
committerMartijn Kaijser <machine.sanctum@gmail.com>2014-12-27 17:48:35 +0100
commit2521e4cc337f11b83287aa92fdbb78fbcc6c3085 (patch)
tree91929f42b93f729f8ca14a40ccb5e543b55e0345
parente9e57580cb2ae1769cb1c7e7014eb1470db0caa8 (diff)
parent99d490452f01818aaef9107d68a0df0cc509b0fb (diff)
Merge pull request #5973 from Montellese/helix_fix_media_history
media library: fix path history for items with a real path differing from the requested path
-rw-r--r--xbmc/windows/GUIMediaWindow.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/xbmc/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp
index fb004efa74..20feeca02e 100644
--- a/xbmc/windows/GUIMediaWindow.cpp
+++ b/xbmc/windows/GUIMediaWindow.cpp
@@ -1472,8 +1472,14 @@ void CGUIMediaWindow::OnInitWindow()
bool updateStartDirectory = (m_startDirectory == m_vecItems->GetPath());
Refresh();
if (updateStartDirectory)
+ {
+ // reset the start directory to the path of the items
m_startDirectory = m_vecItems->GetPath();
+ // reset the history based on the path of the items
+ SetHistoryForPath(m_startDirectory);
+ }
+
m_rootDir.SetAllowThreads(true);
if (m_iSelectedItem > -1)