Merge branch 'hotfix/3.5.16' into develop

2021-01-20 14:38:20 +01:00
parent 4bac38f15f 923d14b787
commit e0d04efd8e
2 changed files with 7 additions and 4 deletions
--- a/app/assets/javascripts/services/desktopManager.ts
+++ b/app/assets/javascripts/services/desktopManager.ts
@@ -197,7 +197,9 @@ export class DesktopManager extends ApplicationService {
  }

  async desktop_requestBackupFile() {
-    const data = this.application!.createBackupFile(EncryptionIntent.FileEncrypted);
+    const data = await this.application!.createBackupFile(
+      EncryptionIntent.FileEncrypted
+    );
    if (data) {
      return JSON.stringify(data, null, 2);
    }