Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-11 01:34:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🐛 云端备份下载恢复报错 Fix https://github.com/siyuan-note/siyuan/issues/5101

Browse source
This commit is contained in:
Liang Ding 2022-06-05 01:54:43 +08:00
parent a1d2ab5ff9
commit 8c39428863
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/backup.go
View file

@ -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

8
kernel/model/osssync.go
View file

@ -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 {