From: alex-z <blackslayer4@gmail.com>
Date: Wed, 3 Aug 2022 13:36:12 +0000 (+0300)
Subject: Do not ignore return value of getFileRecordsByFileId.
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~262^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=90c94c9d59aed90e16f2de0ebe6490dce050fe35;p=nextcloud-desktop.git

Do not ignore return value of getFileRecordsByFileId.

Signed-off-by: alex-z <blackslayer4@gmail.com>
---

diff --git a/src/common/syncjournaldb.cpp b/src/common/syncjournaldb.cpp
index 125c96ffb..801aa5f50 100644
--- a/src/common/syncjournaldb.cpp
+++ b/src/common/syncjournaldb.cpp
@@ -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()) {