From 280a62dd2e621d66ab98674fcebd419ac839a551 Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio@bekerle.com>
Date: Wed, 29 May 2019 17:22:54 +0200
Subject: [PATCH] Fix creation of empty notes at note root folder when
 importing Evernote enex files into a note sub-folder for #1212

---
 src/dialogs/evernoteimportdialog.cpp | 3 ++-
 src/mainwindow.cpp                   | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/dialogs/evernoteimportdialog.cpp b/src/dialogs/evernoteimportdialog.cpp
index 02c1e3719e..40febeb5ab 100644
--- a/src/dialogs/evernoteimportdialog.cpp
+++ b/src/dialogs/evernoteimportdialog.cpp
@@ -542,12 +542,13 @@ void EvernoteImportDialog::importNotes(QString data) {
             Note note = Note();
 //            note.setName(title);
             note.setNoteText(noteText);
+            note.setNoteSubFolderId(noteSubFolder.getId());
 
             // in case the user enabled that the filename can be different
             // from the note name
+            // Attention: may already store the note
             note.handleNoteTextFileName();
 
-            note.setNoteSubFolderId(noteSubFolder.getId());
             note.store();
             note.storeNoteTextFileToDisk();
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e7be392227..2203e6d974 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -9748,7 +9748,10 @@ void MainWindow::selectAllNotesInTagTreeWidget() const {
 }
 
 void MainWindow::on_actionImport_notes_from_Evernote_triggered() {
-    EvernoteImportDialog* dialog = new EvernoteImportDialog(this);
+    const QSignalBlocker blocker(noteDirectoryWatcher);
+    Q_UNUSED(blocker);
+
+    auto dialog = new EvernoteImportDialog(this);
     dialog->exec();
 
     if (dialog->getImportCount() > 0) {