From 78cd46b7568e92bbecaa358bae21f3079ecf11ae Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Wed, 9 Nov 2011 16:11:14 +0100 Subject: [PATCH] fix going to wrong directory in tag editor --- src/tag_editor.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/tag_editor.cpp b/src/tag_editor.cpp index 125ac5e7..8dffed8e 100644 --- a/src/tag_editor.cpp +++ b/src/tag_editor.cpp @@ -872,7 +872,11 @@ void TagEditor::LocateSong(const MPD::Song &s) if (itsBrowsedDir != s.GetDirectory()) { itsBrowsedDir = s.GetDirectory(); - itsBrowsedDir = itsBrowsedDir.substr(0, itsBrowsedDir.rfind('/')); + size_t last_slash = itsBrowsedDir.rfind('/'); + if (last_slash != std::string::npos) + itsBrowsedDir = itsBrowsedDir.substr(0, last_slash); + else + itsBrowsedDir = "/"; if (itsBrowsedDir.empty()) itsBrowsedDir = "/"; Dirs->Clear();