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 {