From 2492e241ac1b22cfbdbcb97739e9365fba69ac22 Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Wed, 8 Jul 2020 11:18:07 +0200 Subject: [PATCH] Adjust to makeDbName returning an absolute path PR #1451 changed the behavior of makeDbName which now returns an absolute path. This obviously then failed in nextcloudcmd which prepended to it the path to the local folder to sync. We just stop doing this to have the journal db end up at the right place in that case as well. Signed-off-by: Kevin Ottens --- src/cmd/cmd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp index a56e9e2f7..cf95be836 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 = SyncJournalDb::makeDbName(credentialFreeUrl, folder, user); SyncJournalDb db(dbPath); if (!selectiveSyncList.empty()) { -- 2.30.2