diff --git a/kernel/model/repository.go b/kernel/model/repository.go index e169976db..12a2a0287 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -49,6 +49,7 @@ import ( "github.com/siyuan-note/siyuan/kernel/cache" "github.com/siyuan-note/siyuan/kernel/conf" "github.com/siyuan-note/siyuan/kernel/filesys" + "github.com/siyuan-note/siyuan/kernel/sql" "github.com/siyuan-note/siyuan/kernel/task" "github.com/siyuan-note/siyuan/kernel/treenode" "github.com/siyuan-note/siyuan/kernel/util" @@ -1244,6 +1245,7 @@ func processSyncMergeResult(exit, byHand bool, start time.Time, mergeResult *dej upsertRootIDs, removeRootIDs := incReindex(upserts, removes) elapsed := time.Since(start) go func() { + sql.WaitForWritingDatabase() util.WaitForUILoaded() if util.ContainerAndroid == util.Container || util.ContainerIOS == util.Container {