diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/syncjournaldb.cpp | 6 |
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()) { |