Do not ignore return value of getFileRecordsByFileId.
authoralex-z <blackslayer4@gmail.com>
Wed, 3 Aug 2022 13:36:12 +0000 (16:36 +0300)
committerMatthieu Gallien <matthieu_gallien@yahoo.fr>
Sat, 17 Sep 2022 07:47:15 +0000 (09:47 +0200)
Signed-off-by: alex-z <blackslayer4@gmail.com>
src/common/syncjournaldb.cpp

index 125c96ffb94ff70d8f21bcb02f6cc668ee31a33f..801aa5f50dbc68dcc6bda49545628045e8db57bd 100644 (file)
@@ -2212,10 +2212,12 @@ QByteArray SyncJournalDb::conflictFileBaseName(const QByteArray &conflictName)
     auto conflict = conflictRecord(conflictName);
     QByteArray result;
     if (conflict.isValid()) {
-        getFileRecordsByFileId(conflict.baseFileId, [&result](const SyncJournalFileRecord &record) {
+        if (!getFileRecordsByFileId(conflict.baseFileId, [&result](const SyncJournalFileRecord &record) {
             if (!record._path.isEmpty())
                 result = record._path;
-        });
+        })) {
+            qCWarning(lcDb) << "conflictFileBaseName failed to getFileRecordsByFileId: " << conflictName;
+        }
     }
 
     if (result.isEmpty()) {