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

🎨 Improve data sync perception when data merging https://github.com/siyuan-note/siyuan/issues/9740

Browse source
This commit is contained in:
Daniel 2023-11-25 17:13:43 +08:00
parent 4cd93b0fec
commit 2f2abf0eff
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
5 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/repository.go
View file

@ -1237,7 +1237,7 @@ func syncRepo(exit, byHand bool) (dataChanged bool, err error) {
return
}
dataChanged = nil == beforeIndex || beforeIndex.ID != afterIndex.ID
dataChanged = nil == beforeIndex || beforeIndex.ID != afterIndex.ID || mergeResult.DataChanged()
util.PushStatusBar(fmt.Sprintf(Conf.Language(149), elapsed.Seconds()))
Conf.Sync.Synced = util.CurrentTimeMillis()