Don't clobber path history when running a search

diff --git a/xbmc/filesystem/DirectoryHistory.cpp b/xbmc/filesystem/DirectoryHistory.cpp
index 12124c6..6f9fb7c 100644 (file)
--- a/xbmc/filesystem/DirectoryHistory.cpp
+++ b/xbmc/filesystem/DirectoryHistory.cpp
@@ -118,6 +118,15 @@ void CDirectoryHistory::ClearPathHistory()
   m_vecPathHistory.clear();
 }
 
+void CDirectoryHistory::ClearSearchHistory()
+{
+  for (vector<CPathHistoryItem>::iterator it = m_vecPathHistory.begin(); it != m_vecPathHistory.end(); ++it)
+  {
+    if (it->GetPath().Left(14) == "musicsearch://")
+      it = m_vecPathHistory.erase(it);
+  }
+}
+
 void CDirectoryHistory::DumpPathHistory()
 {
   // debug log

diff --git a/xbmc/filesystem/DirectoryHistory.h b/xbmc/filesystem/DirectoryHistory.h
index 1608718..6f8c6b0 100644 (file)
--- a/xbmc/filesystem/DirectoryHistory.h
+++ b/xbmc/filesystem/DirectoryHistory.h
@@ -59,6 +59,7 @@ public:
   CStdString GetParentPath(bool filter = false);
   CStdString RemoveParentPath(bool filter = false);
   void ClearPathHistory();
+  void ClearSearchHistory();
   void DumpPathHistory();
 
 private:

diff --git a/xbmc/music/windows/GUIWindowMusicNav.cpp b/xbmc/music/windows/GUIWindowMusicNav.cpp
index bbe1da9..3a2439e 100644 (file)
--- a/xbmc/music/windows/GUIWindowMusicNav.cpp
+++ b/xbmc/music/windows/GUIWindowMusicNav.cpp
@@ -772,7 +772,7 @@ void CGUIWindowMusicNav::OnSearchUpdate()
   if (!search.IsEmpty())
   {
     CStdString path = "musicsearch://" + search + "/";
-    m_history.ClearPathHistory();
+    m_history.ClearSearchHistory();
     Update(path);
   }
   else if (m_vecItems->IsVirtualDirectoryRoot())