Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5233 from naokiiwakami/5151

Browse Source 
Fix issue in checking existence of media files pointed by CUE files
This commit is contained in:
John Maguire 2016-02-09 13:55:40 +00:00
commit 8dd933b265
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/library/librarywatcher.cpp
View File

@ -491,8 +491,9 @@ SongList LibraryWatcher::ScanNewFile(const QString& file, const QString& path,
// Ignore FILEs pointing to other media files. Also, watch out for incorrect // Ignore FILEs pointing to other media files. Also, watch out for incorrect
// media files. Playlist parser for CUEs considers every entry in sheet // media files. Playlist parser for CUEs considers every entry in sheet
// valid and we don't want invalid media getting into library! // valid and we don't want invalid media getting into library!
QString file_nfd = file.normalized(QString::NormalizationForm_D);
for (const Song& cue_song : cue_parser_->Load(&cue, matching_cue, path)) { for (const Song& cue_song : cue_parser_->Load(&cue, matching_cue, path)) {
if (cue_song.url().toLocalFile() == file) { if (cue_song.url().toLocalFile().normalized(QString::NormalizationForm_D) == file_nfd) {
if (TagReaderClient::Instance()->IsMediaFileBlocking(file)) { if (TagReaderClient::Instance()->IsMediaFileBlocking(file)) {
song_list << cue_song; song_list << cue_song;
} }