lyrics: fix loading of files with DOS line endings

This commit is contained in:
Andrzej Rybczak
2016-11-16 05:50:40 +01:00
parent d98b8ca1c1
commit dac0d4602f
2 changed files with 3 additions and 0 deletions

View File

@@ -316,6 +316,8 @@ void Lyrics::Load()
std::string line;
while (std::getline(input, line))
{
// Remove carriage returns as they mess up the display.
line.erase(std::remove(line.begin(), line.end(), '\r'), line.end());
if (!first)
w << '\n';
w << Charset::utf8ToLocale(line);