Merge pull request #9973 from greatjourney589/fix/editlocally-qassert-side-effect

nilsding · web-flow · commit 271efddda19d · 2026-05-07T11:57:17.000+02:00
fix(editLocally): evaluate lock-record DB call outside Q_ASSERT
diff --git a/src/gui/editlocallyjob.cpp b/src/gui/editlocallyjob.cpp
@@ -514,7 +514,8 @@ void EditLocallyJob::disconnectFolderSignals()
 void EditLocallyJob::fileAlreadyLocked()
 {
     SyncJournalFileRecord rec;
-    Q_ASSERT(_folderForFile->journalDb()->getFileRecord(_relativePathToRemoteRoot, &rec));
+    const auto recordFetched = _folderForFile->journalDb()->getFileRecord(_relativePathToRemoteRoot, &rec);
+    Q_ASSERT(recordFetched);
     Q_ASSERT(rec.isValid());
     Q_ASSERT(rec._lockstate._locked);
 

Original file line number	Diff line number	Diff line change
`@@ -514,7 +514,8 @@ void EditLocallyJob::disconnectFolderSignals()`
`514`	`514`	`void EditLocallyJob::fileAlreadyLocked()`
`515`	`515`	`{`
`516`	`516`	`SyncJournalFileRecord rec;`
`517`		`- Q_ASSERT(_folderForFile->journalDb()->getFileRecord(_relativePathToRemoteRoot, &rec));`
	`517`	`+ const auto recordFetched = _folderForFile->journalDb()->getFileRecord(_relativePathToRemoteRoot, &rec);`
	`518`	`+ Q_ASSERT(recordFetched);`
`518`	`519`	`Q_ASSERT(rec.isValid());`
`519`	`520`	`Q_ASSERT(rec._lockstate._locked);`
`520`	`521`