mirror of
https://github.com/strawberrymusicplayer/strawberry
synced 2024-12-14 01:26:00 +01:00
Close files in song loader
This commit is contained in:
parent
c1a815778b
commit
4cb3f9d177
@ -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) {
|
||||||
|
Loading…
Reference in New Issue
Block a user