Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-23 18:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🐛 更新或删除文档后立即点击重建索引导致死锁 Fix https://github.com/siyuan-note/siyuan/issues/5768

Browse source
This commit is contained in:
Liang Ding 2022-08-31 12:48:49 +08:00
parent 7f9c598061
commit 46ed13a840
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/box.go
View file

@ -476,13 +476,13 @@ func ReindexTree(path string) (err error) {
func RefreshFileTree() { func RefreshFileTree() {
WaitForWritingFiles() WaitForWritingFiles()
util.PushEndlessProgress(Conf.Language(35))
if err := sql.InitDatabase(true); nil != err { if err := sql.InitDatabase(true); nil != err {
util.PushErrMsg(fmt.Sprintf(Conf.Language(85), err), 5000) util.PushErrMsg(fmt.Sprintf(Conf.Language(85), err), 5000)
return return
} }
treenode.InitBlockTree(true) treenode.InitBlockTree(true)
util.PushEndlessProgress(Conf.Language(35))
openedBoxes := Conf.GetOpenedBoxes() openedBoxes := Conf.GetOpenedBoxes()
for _, openedBox := range openedBoxes { for _, openedBox := range openedBoxes {
openedBox.Index(true) openedBox.Index(true)

4
kernel/sql/database.go
View file

@ -59,6 +59,10 @@ func init() {
func InitDatabase(forceRebuild bool) (err error) { func InitDatabase(forceRebuild bool) (err error) {
util.IncBootProgress(2, "Initializing database...") util.IncBootProgress(2, "Initializing database...")
if forceRebuild {
WaitForWritingDatabase()
}
initDBConnection() initDBConnection()
if !forceRebuild { if !forceRebuild {