From 9d22e4ec07f8914e94f5ed0043a0865d37c102e1 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 24 Aug 2024 21:12:19 +0200 Subject: [PATCH] SongLoader: Use Song::kRejectedExtensions Fixes #1525 --- src/core/songloader.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/core/songloader.cpp b/src/core/songloader.cpp index fb8e42f0a..ecef7713b 100644 --- a/src/core/songloader.cpp +++ b/src/core/songloader.cpp @@ -175,7 +175,9 @@ SongLoader::Result SongLoader::LoadLocalPartial(const QString &filename) { } // Assume it's just a normal file - if (TagReaderClient::Instance()->IsMediaFileBlocking(filename) || Song::kAcceptedExtensions.contains(fileinfo.suffix(), Qt::CaseInsensitive)) { + if (!Song::kRejectedExtensions.contains(fileinfo.suffix(), Qt::CaseInsensitive) && + (TagReaderClient::Instance()->IsMediaFileBlocking(filename) || + Song::kAcceptedExtensions.contains(fileinfo.suffix(), Qt::CaseInsensitive))) { Song song(Song::Source::LocalFile); song.InitFromFilePartial(filename, fileinfo); if (song.is_valid()) { @@ -319,7 +321,9 @@ SongLoader::Result SongLoader::LoadLocalAsync(const QString &filename) { } // Assume it's just a normal file - if (TagReaderClient::Instance()->IsMediaFileBlocking(filename) || Song::kAcceptedExtensions.contains(fileinfo.suffix(), Qt::CaseInsensitive)) { + if (!Song::kRejectedExtensions.contains(fileinfo.suffix(), Qt::CaseInsensitive) && + (TagReaderClient::Instance()->IsMediaFileBlocking(filename) || + Song::kAcceptedExtensions.contains(fileinfo.suffix(), Qt::CaseInsensitive))) { Song song(Song::Source::LocalFile); song.InitFromFilePartial(filename, fileinfo); if (song.is_valid()) {