aboutsummaryrefslogtreecommitdiffstats
path: root/src/Mapper.cxx
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Mapper.cxx8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/Mapper.cxx b/src/Mapper.cxx
index e2d082122..7c89ba7c4 100644
--- a/src/Mapper.cxx
+++ b/src/Mapper.cxx
@@ -248,7 +248,7 @@ map_song_fs(const Song *song)
return Path::FromUTF8(song->uri);
}
-char *
+std::string
map_fs_to_utf8(const char *path_fs)
{
if (!music_dir_fs.IsNull() &&
@@ -263,11 +263,7 @@ map_fs_to_utf8(const char *path_fs)
while (path_fs[0] == G_DIR_SEPARATOR)
++path_fs;
- const std::string path_utf8 = Path::ToUTF8(path_fs);
- if (path_utf8.empty())
- return nullptr;
-
- return g_strdup(path_utf8.c_str());
+ return Path::ToUTF8(path_fs);
}
const Path &