Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralex-z <blackslayer4@gmail.com>2022-08-03 16:36:12 +0300
committerMatthieu Gallien <matthieu_gallien@yahoo.fr>2022-09-17 10:47:15 +0300
commit90c94c9d59aed90e16f2de0ebe6490dce050fe35 (patch)
tree4ec504decb4f656ef464b20675c99ef8134c47f2 /src/common
parent0b7813ee7af8c3094a9943bcadcca37017699d44 (diff)
Do not ignore return value of getFileRecordsByFileId.
Signed-off-by: alex-z <blackslayer4@gmail.com>
Diffstat (limited to 'src/common')
-rw-r--r--src/common/syncjournaldb.cpp6
1 files changed, 4 insertions, 2 deletions
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()) {