Merge pull request #15 from sailfishos/no_db_check

[transfer-engine] Don't try opening database if its file doesn't exist. JB#47387
sailfishos · Apr 5, 2024 · 3b4ac08 · 3b4ac08
2 parents 25a9d2d + b523e8d
commit 3b4ac08
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/declarative/declarativetransfermodel.cpp b/declarative/declarativetransfermodel.cpp
@@ -84,7 +84,7 @@ TransferModel::Status TransferModel::status() const
 
 void TransferModel::refresh()
 {
-    if (!m_complete || m_roles.isEmpty()) {
+    if (!m_complete) {
         return;
     }
 
@@ -199,12 +199,12 @@ void TransferModel::componentComplete()
                                            QDBusConnection::sessionBus(),
                                            this);
 
-    connect(m_client,   SIGNAL(progressChanged(int,double)),
-            this,       SLOT(refresh()));
-    connect(m_client,   SIGNAL(transfersChanged()),
-            this,       SLOT(refresh()));
-    connect(m_client,   SIGNAL(statusChanged(int,int)),
-            this,       SLOT(refresh()));
+    connect(m_client, SIGNAL(progressChanged(int,double)),
+            this, SLOT(refresh()));
+    connect(m_client, SIGNAL(transfersChanged()),
+            this, SLOT(refresh()));
+    connect(m_client, SIGNAL(statusChanged(int,int)),
+            this, SLOT(refresh()));
 }
 
 void TransferModel::insertRange(
@@ -411,7 +411,12 @@ QSqlDatabase TransferModel::database()
                                 + DB_PATH + QDir::separator()
                                 + DB_NAME;
 
-	TransferDatabase database;
+        if (!QFile::exists(absDbPath)) {
+            qWarning() << "Database file doesn't exist:" << absDbPath;
+            return QSqlDatabase();
+        }
+
+        TransferDatabase database;
         database.setDatabaseName(absDbPath);
         database.setConnectOptions(QLatin1String("QSQLITE_OPEN_READONLY")); // sanity check
         thread_database.setLocalData(database);