dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix closing databases

Browse Source
This commit is contained in:
Jonas Kvinge
2019-07-25 17:56:28 +02:00
parent 41484f8673
commit 81caec99b7
10 changed files with 82 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/device/devicedatabasebackend.cpp
View File

@@ -80,27 +80,31 @@ void DeviceDatabaseBackend::Exit() {
DeviceDatabaseBackend::DeviceList DeviceDatabaseBackend::GetAllDevices() {
QMutexLocker l(db_->Mutex());
QSqlDatabase db(db_->Connect());
DeviceList ret;
QSqlQuery q(db);
q.prepare("SELECT ROWID, unique_id, friendly_name, size, icon, transcode_mode, transcode_format FROM devices");
q.exec();
if (db_->CheckErrors(q)) return ret;
{
QMutexLocker l(db_->Mutex());
QSqlDatabase db(db_->Connect());
QSqlQuery q(db);
q.prepare("SELECT ROWID, unique_id, friendly_name, size, icon, transcode_mode, transcode_format FROM devices");
q.exec();
if (db_->CheckErrors(q)) return ret;
while (q.next()) {
Device dev;
dev.id_ = q.value(0).toInt();
dev.unique_id_ = q.value(1).toString();
dev.friendly_name_ = q.value(2).toString();
dev.size_ = q.value(3).toLongLong();
dev.icon_name_ = q.value(4).toString();
dev.transcode_mode_ = MusicStorage::TranscodeMode(q.value(5).toInt());
dev.transcode_format_ = Song::FileType(q.value(6).toInt());
ret << dev;
while (q.next()) {
Device dev;
dev.id_ = q.value(0).toInt();
dev.unique_id_ = q.value(1).toString();
dev.friendly_name_ = q.value(2).toString();
dev.size_ = q.value(3).toLongLong();
dev.icon_name_ = q.value(4).toString();
dev.transcode_mode_ = MusicStorage::TranscodeMode(q.value(5).toInt());
dev.transcode_format_ = Song::FileType(q.value(6).toInt());
ret << dev;
}
}
Close();
return ret;
}