itemsync: Avoid conflicting notes and text

Fixes #2355
hluk · Sep 10, 2023 · 9a2f6f6 · 9a2f6f6
1 parent 42c02f2
commit 9a2f6f6
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/plugins/itemsync/filewatcher.cpp b/plugins/itemsync/filewatcher.cpp
@@ -101,10 +101,9 @@ void getBaseNameAndExtension(const QString &fileName, QString *baseName, QString
     }
 }
 
-const std::array<Ext, 12> &fileExtensionsAndFormats()
+const std::array<Ext, 11> &fileExtensionsAndFormats()
 {
-    static const std::array<Ext, 12> exts = {
-        Ext(noteFileSuffix, mimeItemNotes),
+    static const std::array<Ext, 11> exts = {
         Ext(".txt", mimeText),
         Ext(".html", mimeHtml),
         Ext(".uri", mimeUriList),
@@ -147,6 +146,10 @@ Ext findByExtension(const QString &fileName, const QList<FileFormat> &formatSett
     if ( fileName.endsWith(dataFileSuffix) )
         return Ext(dataFileSuffix, mimeUnknownFormats);
 
+    // Avoid conflicting notes with text.
+    if ( fileName.endsWith(noteFileSuffix) )
+        return Ext(noteFileSuffix, mimeItemNotes);
+
     // Find in user defined formats.
     bool hasUserFormat = false;
     for (const auto &format : formatSettings) {