Main: chop separators from music directory

Move call from Mapper.cxx.

Main: chop separators from music directory
c45f2055 · Max Kellermann · 027b2063 · c45f2055 · c45f2055
Commit c45f2055 authored Feb 07, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

Main.cxx src/Main.cxx +3 -0

Mapper.cxx src/Mapper.cxx +0 -1

No files found.
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -145,6 +145,9 @@ glue_mapper_init(Error &error)
 	if (music_dir.IsNull())
 		music_dir = GetUserMusicDir();

+	if (!music_dir.IsNull())
+		music_dir.ChopSeparators();
+
 #ifdef ENABLE_DATABASE
 	if (!music_dir.IsNull()) {
 		const auto music_dir_utf8 = music_dir.ToUTF8();

--- a/src/Mapper.cxx
+++ b/src/Mapper.cxx
@@ -92,7 +92,6 @@ mapper_set_music_dir(AllocatedPath &&path)
 	assert(!path.IsNull());

 	music_dir_fs = std::move(path);
-	music_dir_fs.ChopSeparators();

 	const auto music_dir_utf8 = music_dir_fs.ToUTF8();