Fix closing databases

src/device/connecteddevice.cpp

@@ -70,6 +70,7 @@ ConnectedDevice::ConnectedDevice(const QUrl &url, DeviceLister *lister, const QS
 }
 
 ConnectedDevice::~ConnectedDevice() {
+  backend_->Close();
   backend_->deleteLater();
 }
 

src/device/devicedatabasebackend.cpp

@@ -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;
 
 }

src/device/devicemanager.cpp

@@ -182,6 +182,7 @@ void DeviceManager::LoadAllDevices() {
     info->InitFromDb(device);
     emit DeviceCreatedFromDB(info);
   }
+
   backend_->Close();
 
 }

src/device/gpoddevice.cpp

@@ -219,6 +219,8 @@ void GPodDevice::WriteDatabase(bool success) {
     }
   }
 
+  backend_->Close();
+
   songs_to_add_.clear();
   songs_to_remove_.clear();
   db_busy_.unlock();

src/device/mtpdevice.cpp

@@ -184,6 +184,8 @@ void MtpDevice::FinishCopy(bool success) {
   songs_to_add_.clear();
   songs_to_remove_.clear();
 
+  backend_->Close();
+
   db_busy_.unlock();
 
   ConnectedDevice::FinishCopy(success);