This commit is contained in:
Daniel 2024-10-21 09:48:13 +08:00
parent f7f48b23f6
commit 667c9075b5
No known key found for this signature in database
GPG key ID: 86211BA83DF03017

View file

@ -1521,10 +1521,6 @@ func processSyncMergeResult(exit, byHand bool, mergeResult *dejavu.MergeResult,
return
}
if needReloadFiletree {
util.PushReloadFiletree()
}
if exit { // 退出时同步不用推送事件
return
}
@ -1539,18 +1535,24 @@ func processSyncMergeResult(exit, byHand bool, mergeResult *dejavu.MergeResult,
box.Index()
}
}
if 0 < len(needUnindexBoxes) || 0 < len(needIndexBoxes) {
needReloadUI := 0 < len(needUnindexBoxes) || 0 < len(needIndexBoxes)
if needReloadUI {
util.ReloadUI()
}
upsertRootIDs, removeRootIDs := incReindex(upserts, removes)
needReloadFiletree = !needReloadUI && (needReloadFiletree || 0 < len(upsertRootIDs) || 0 < len(removeRootIDs))
if needReloadFiletree {
util.PushReloadFiletree()
}
go func() {
util.WaitForUILoaded()
if 0 < len(upsertRootIDs) || 0 < len(removeRootIDs) {
util.BroadcastByType("main", "syncMergeResult", 0, "",
map[string]interface{}{"upsertRootIDs": upsertRootIDs, "removeRootIDs": removeRootIDs})
util.PushReloadFiletree()
}
time.Sleep(2 * time.Second)