From: Kevin Ottens <kevin.ottens@nextcloud.com>
Date: Thu, 5 Nov 2020 14:24:45 +0000 (+0100)
Subject: Partial Revert "Adapted for cmd version and added migration step for config file"
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~22^2~66^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1b553b93b9b4309a6509c703dd17b03ac9a9e992;p=nextcloud-desktop.git

Partial Revert "Adapted for cmd version and added migration step for config file"

This partially reverts commit 67ed54671b5f3be9520089f85d9e2e7aebc037f6.

The migration code was left untouched.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
---

diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
index 65179cdfb..c521465cc 100644
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -499,7 +499,7 @@ restart_sync:
     }
 
     Cmd cmd;
-    QString dbPath = options.source_dir + SyncJournalDb::makeDbName(credentialFreeUrl, folder, user);
+    QString dbPath = options.source_dir + SyncJournalDb::makeDbName(options.source_dir, credentialFreeUrl, folder, user);
     SyncJournalDb db(dbPath);
 
     if (!selectiveSyncList.empty()) {