Fix regression in playlist backend caused by previous commits
This commit is contained in:
parent
6f3bc74db0
commit
da0d61f36a
|
@ -189,10 +189,6 @@ QSqlQuery PlaylistBackend::GetPlaylistRows(int playlist) {
|
||||||
q.bindValue(":playlist", playlist);
|
q.bindValue(":playlist", playlist);
|
||||||
q.exec();
|
q.exec();
|
||||||
|
|
||||||
if (QThread::currentThread() != thread() && QThread::currentThread() != qApp->thread()) {
|
|
||||||
db_->Close();
|
|
||||||
}
|
|
||||||
|
|
||||||
return q;
|
return q;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -209,6 +205,11 @@ QList<PlaylistItemPtr> PlaylistBackend::GetPlaylistItems(int playlist) {
|
||||||
while (q.next()) {
|
while (q.next()) {
|
||||||
playlistitems << NewPlaylistItemFromQuery(SqlRow(q), state_ptr);
|
playlistitems << NewPlaylistItemFromQuery(SqlRow(q), state_ptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (QThread::currentThread() != thread() && QThread::currentThread() != qApp->thread()) {
|
||||||
|
db_->Close();
|
||||||
|
}
|
||||||
|
|
||||||
return playlistitems;
|
return playlistitems;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -225,6 +226,11 @@ QList<Song> PlaylistBackend::GetPlaylistSongs(int playlist) {
|
||||||
while (q.next()) {
|
while (q.next()) {
|
||||||
songs << NewSongFromQuery(SqlRow(q), state_ptr);
|
songs << NewSongFromQuery(SqlRow(q), state_ptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (QThread::currentThread() != thread() && QThread::currentThread() != qApp->thread()) {
|
||||||
|
db_->Close();
|
||||||
|
}
|
||||||
|
|
||||||
return songs;
|
return songs;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue