From 8c394288633fb58ca0a3978728ab2f48a029d79b Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Sun, 5 Jun 2022 01:54:43 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BA=91=E7=AB=AF=E5=A4=87=E4=BB=BD?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=81=A2=E5=A4=8D=E6=8A=A5=E9=94=99=20Fix=20?=
 =?UTF-8?q?https://github.com/siyuan-note/siyuan/issues/5101?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/backup.go  | 2 +-
 kernel/model/osssync.go | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/kernel/model/backup.go b/kernel/model/backup.go
index fc41a6253..fae75c5cb 100644
--- a/kernel/model/backup.go
+++ b/kernel/model/backup.go
@@ -235,7 +235,7 @@ func RecoverLocalBackup() (err error) {
 	if syncEnabled {
 		func() {
 			time.Sleep(5 * time.Second)
-			util.PushMsg(Conf.Language(134), 7000)
+			util.PushMsg(Conf.Language(134), 0)
 		}()
 	}
 	return
diff --git a/kernel/model/osssync.go b/kernel/model/osssync.go
index 972d1d4d6..ed388eca0 100644
--- a/kernel/model/osssync.go
+++ b/kernel/model/osssync.go
@@ -229,9 +229,11 @@ func ossDownload(localDirPath, cloudDirPath string, bootOrExit bool) (fetchedFil
 		return
 	}
 
-	err = ossDownload0(localDirPath, cloudDirPath, "/.siyuan/conf.json", &fetchedFilesCount, &transferSize, bootOrExit)
-	if nil != err {
-		return
+	if "backup" != cloudDirPath {
+		err = ossDownload0(localDirPath, cloudDirPath, "/.siyuan/conf.json", &fetchedFilesCount, &transferSize, bootOrExit)
+		if nil != err {
+			return
+		}
 	}
 
 	if needPushProgress {