#3575 fix: note folder switching with pending note saves

Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>

Author: pbek

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 26.4.19
 
+- Fixed note folder switching so all modified notes are written to disk before
+  another note folder becomes active, preventing edited notes from being saved
+  into the newly selected folder instead of their original one (for
+  [#3575](https://github.com/pbek/QOwnNotes/issues/3575))
 - Fixed the **Navigation panel** heading parser so lines inside fenced code
   blocks are no longer interpreted as Markdown headings, preventing entries
   like `# ls -l` or `## test` from appearing in the heading tree (for

src/entities/note.cpp

@@ -2810,6 +2810,19 @@ int Note::storeDirtyNotesToDisk(Note &currentNote, bool *currentNoteChanged, boo
     return count;
 }
 
+bool Note::hasDirtyNotes() {
+    const QSqlDatabase db = QSqlDatabase::database(QStringLiteral("memory"));
+    QSqlQuery query(db);
+
+    query.prepare(QStringLiteral("SELECT COUNT(*) AS cnt FROM note WHERE has_dirty_data = 1"));
+    if (!query.exec()) {
+        qWarning() << __func__ << ": " << query.lastError();
+        return true;
+    }
+
+    return !query.first() || (query.value(QStringLiteral("cnt")).toInt() > 0);
+}
+
 /**
  * Strips trailing whitespaces off the note text
  *

src/entities/note.h

@@ -138,6 +138,8 @@ class Note {
                                      bool *noteWasRenamed = nullptr,
                                      bool *currentNoteTextChanged = nullptr);
 
+    static bool hasDirtyNotes();
+
     bool updateNoteTextFromDisk();
 
     friend QDebug operator<<(QDebug dbg, const Note &note);

src/mainwindow.cpp

@@ -2100,30 +2100,42 @@ bool MainWindow::changeNoteFolder(const int noteFolderId, const bool forceChange
 
     QString folderName = noteFolder.getLocalPath();
     const QString oldPath = this->notesPath;
-
-    // Switch the active note folder first so all subsequent refresh steps
-    // (including combo/menu rebuilding) use the correct current folder.
-    noteFolder.setAsCurrent();
-
     const bool notesPathChanged = (oldPath != folderName);
 
     // reload notes if notes folder was changed
     if (notesPathChanged) {
+        // Store everything before changing folder
+        storeUpdatedNotesToDisk();
+
+        if (Note::hasDirtyNotes()) {
+            loadNoteFolderListMenu();
+            QMessageBox::warning(
+                this, tr("Could not switch note folder"),
+                tr("Modified notes could not be written to disk. Please resolve the problem and "
+                   "try switching note folders again."));
+            return false;
+        }
+
         const QSignalBlocker blocker2(this->ui->searchLineEdit);
         {
             Q_UNUSED(blocker2)
             ui->searchLineEdit->clear();
         }
 
-        // store everything before changing folder
-        storeUpdatedNotesToDisk();
-
         // commit the changes in the current note folder to git
         gitCommitCurrentNoteFolder();
 
         // update the recent note folder list
         storeRecentNoteFolder(this->notesPath, folderName);
 
+        // Switch the active note folder only after all pending writes for the
+        // current folder were flushed to disk.
+        noteFolder.setAsCurrent();
+
+        // Rebuild the selector and menu after switching so the newly active
+        // note folder stays selected in the UI.
+        loadNoteFolderListMenu();
+
         // change notes path
         this->notesPath = folderName;
 
@@ -2139,6 +2151,8 @@ bool MainWindow::changeNoteFolder(const int noteFolderId, const bool forceChange
         // switching to another note folder
         unsetCurrentNote();
     } else {
+        noteFolder.setAsCurrent();
+
         // Keep selector and Note -> Note folders menu in sync when switching
         // between folders that share the same path.
         loadNoteFolderListMenu();