Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix regression in playlist backend caused by previous commits

This commit is contained in:
Jonas Kvinge 2019-07-24 21:37:09 +02:00
parent 6f3bc74db0
commit da0d61f36a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/playlist/playlistbackend.cpp
View File

@ -189,10 +189,6 @@ QSqlQuery PlaylistBackend::GetPlaylistRows(int playlist) {
q.bindValue(":playlist", playlist);
q.exec();
if (QThread::currentThread() != thread() && QThread::currentThread() != qApp->thread()) {
db_->Close();
}
return q;
}
@ -209,6 +205,11 @@ QList<PlaylistItemPtr> PlaylistBackend::GetPlaylistItems(int playlist) {
while (q.next()) {
playlistitems << NewPlaylistItemFromQuery(SqlRow(q), state_ptr);
}
if (QThread::currentThread() != thread() && QThread::currentThread() != qApp->thread()) {
db_->Close();
}
return playlistitems;
}
@ -225,6 +226,11 @@ QList<Song> PlaylistBackend::GetPlaylistSongs(int playlist) {
while (q.next()) {
songs << NewSongFromQuery(SqlRow(q), state_ptr);
}
if (QThread::currentThread() != thread() && QThread::currentThread() != qApp->thread()) {
db_->Close();
}
return songs;
}