Merge branch 'develop'

JackGruber · Aug 11, 2021 · 9c38042 · 9c38042
2 parents 022ef0d + 7624080
commit 9c38042
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## not released
 
+- Fix: #19 Backups failed from Joplin version v2.2.5 and higher, due to the removed template function
+
 ## v1.0.2 (2021-07-19)
 
 - Improved: Use of moments token

diff --git a/src/Backup.ts b/src/Backup.ts
@@ -743,10 +743,14 @@ class Backup {
     );
 
     // Backup Templates
-    await this.backupFolder(
-      await await joplinWrapper.settingsGlobalValue("templateDir"),
-      path.join(activeBackupFolderProfile, "templates")
-    );
+    try {
+      await this.backupFolder(
+        await await joplinWrapper.settingsGlobalValue("templateDir"),
+        path.join(activeBackupFolderProfile, "templates")
+      );
+    } catch (error) {
+      this.log.info("No templateDir, Joplin >= v2.2.5");
+    }
   }
 
   private async backupFolder(src: string, dst: string): Promise<boolean> {