summaryrefslogtreecommitdiff
path: root/src/lyrics.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lyrics.cpp')
-rw-r--r--src/lyrics.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lyrics.cpp b/src/lyrics.cpp
index a55aa5f4..1e4e4f5e 100644
--- a/src/lyrics.cpp
+++ b/src/lyrics.cpp
@@ -20,6 +20,7 @@
#include <cassert>
#include <cerrno>
+#include <cstring>
#include <fstream>
#include "browser.h"
@@ -305,7 +306,7 @@ std::string Lyrics::GenerateFilename(const MPD::Song &s)
file += " - ";
file += locale_to_utf_cpy(s.getTitle());
file += ".txt";
- EscapeUnallowedChars(file);
+ removeInvalidCharsFromFilename(file);
filename = Config.lyrics_directory;
filename += "/";
filename += file;
@@ -402,7 +403,7 @@ void Lyrics::Refetch()
if (remove(itsFilename.c_str()) && errno != ENOENT)
{
const char msg[] = "Couldn't remove \"%s\": %s";
- ShowMessage(msg, Shorten(TO_WSTRING(itsFilename), COLS-static_strlen(msg)-25).c_str(), strerror(errno));
+ ShowMessage(msg, Shorten(TO_WSTRING(itsFilename), COLS-const_strlen(msg)-25).c_str(), strerror(errno));
return;
}
Load();