Skip to content

Commit 0c48938

Browse files
committed
#3359 fix: try to mitigate Nextcloud sync errors
Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
1 parent 8d17ec1 commit 0c48938

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## 25.9.2
44

5+
- Try to mitigate Nextcloud sync errors by not triggering an expiration of
6+
trashed notes periodically, rather we want to do it after the note folder
7+
was reloaded (for [#3359](https://github.com/pbek/QOwnNotes/issues/3359))
58
- The save button in the **Nextcloud Deck dialog** will now only insert a link
69
into the current note for new cards (for [#3357](https://github.com/pbek/QOwnNotes/issues/3357))
710
- The Groq AI model list was updated (for [#3365](https://github.com/pbek/QOwnNotes/issues/3365), thank you, @Weej1)

src/mainwindow.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,6 +1073,11 @@ void MainWindow::buildNotesIndexAndLoadNoteDirectoryList(bool forceBuild, bool f
10731073

10741074
if (wasBuilt || forceLoad) {
10751075
loadNoteDirectoryList();
1076+
1077+
// Expire trashed items
1078+
// It is safer to do that here than in MainWindow::frequentPeriodicChecker(), to avoid
1079+
// sync errors after resuming from suspend
1080+
TrashItem::expireItems();
10761081
}
10771082

10781083
if (wasBuilt && reloadTabs) {
@@ -3139,9 +3144,6 @@ void MainWindow::frequentPeriodicChecker() {
31393144
} else if (lastUpdateCheck.addSecs(3600) <= QDateTime::currentDateTime()) {
31403145
// check for updates every 1h
31413146
updateService->checkForUpdates(UpdateService::Periodic);
3142-
3143-
// expire trashed items
3144-
TrashItem::expireItems();
31453147
}
31463148
}
31473149

0 commit comments

Comments
 (0)