From 0a54c5135b3a91c046505df1e4b58bb9e5f26d80 Mon Sep 17 00:00:00 2001 From: John Maguire Date: Thu, 17 Mar 2011 16:05:08 +0000 Subject: [PATCH] Ignore empty lines in m3u files. Fixes issue #1403 --- src/playlistparsers/m3uparser.cpp | 2 +- tests/data/test.m3u | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/playlistparsers/m3uparser.cpp b/src/playlistparsers/m3uparser.cpp index 84b8ed09e..6a2b74794 100644 --- a/src/playlistparsers/m3uparser.cpp +++ b/src/playlistparsers/m3uparser.cpp @@ -56,7 +56,7 @@ SongList M3UParser::Load(QIODevice* device, const QString& playlist_path, const continue; } } - } else { + } else if (!line.isEmpty()) { Song song; // Track location. diff --git a/tests/data/test.m3u b/tests/data/test.m3u index 5dd8f0c5f..fa6523ad9 100644 --- a/tests/data/test.m3u +++ b/tests/data/test.m3u @@ -477,3 +477,7 @@ /home/kadai/Music/COLLECTION/1993/Various Artists/ラングリッサー 光輝の末裔/14 - Kingdom Knight Ledin.mp3 #EXTINF:85,ほっぴンちょっぴン /home/kadai/Music/COLLECTION/2005/Various Artists/Dance Dance Revolution with Mario/14 - ほっぴンちょっぴン.mp3 + + + +