Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2024-12-14 09:44:51 +01:00
Code Issues Releases Wiki Activity

Close files in song loader

Browse Source
This commit is contained in:
Jonas Kvinge 2021-07-11 00:45:30 +02:00
parent c1a815778b
commit 4cb3f9d177
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/songloader.cpp
View File

@ -286,6 +286,7 @@ SongLoader::Result SongLoader::LoadLocalAsync(const QString &filename) {
return Error; return Error;
} }
QByteArray data(file.read(PlaylistParser::kMagicSize)); QByteArray data(file.read(PlaylistParser::kMagicSize));
file.close();
ParserBase *parser = playlist_parser_->ParserForMagic(data); ParserBase *parser = playlist_parser_->ParserForMagic(data);
if (!parser) { if (!parser) {
@ -306,6 +307,7 @@ SongLoader::Result SongLoader::LoadLocalAsync(const QString &filename) {
QFile cue(matching_cue); QFile cue(matching_cue);
if (cue.open(QIODevice::ReadOnly)) { if (cue.open(QIODevice::ReadOnly)) {
const SongList songs = cue_parser_->Load(&cue, matching_cue, QDir(filename.section('/', 0, -2))); const SongList songs = cue_parser_->Load(&cue, matching_cue, QDir(filename.section('/', 0, -2)));
cue.close();
for (const Song &song : songs) { for (const Song &song : songs) {
if (song.is_valid()) songs_ << song; if (song.is_valid()) songs_ << song;
} }
@ -360,6 +362,7 @@ void SongLoader::LoadPlaylist(ParserBase *parser, const QString &filename) {
QFile file(filename); QFile file(filename);
file.open(QIODevice::ReadOnly); file.open(QIODevice::ReadOnly);
songs_ = parser->Load(&file, filename, QFileInfo(filename).path()); songs_ = parser->Load(&file, filename, QFileInfo(filename).path());
file.close();
} }
static bool CompareSongs(const Song &left, const Song &right) { static bool CompareSongs(const Song &left, const Song &right) {