From 46ed13a8401096bc881bea0c9193bfb1108433fb Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Wed, 31 Aug 2022 12:48:49 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E6=9B=B4=E6=96=B0=E6=88=96=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=96=87=E6=A1=A3=E5=90=8E=E7=AB=8B=E5=8D=B3=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E9=87=8D=E5=BB=BA=E7=B4=A2=E5=BC=95=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E6=AD=BB=E9=94=81=20Fix=20https://github.com/siyuan-note/siyua?=
 =?UTF-8?q?n/issues/5768?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/box.go    | 2 +-
 kernel/sql/database.go | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/kernel/model/box.go b/kernel/model/box.go
index 1a069cb00..7b1ee0b44 100644
--- a/kernel/model/box.go
+++ b/kernel/model/box.go
@@ -476,13 +476,13 @@ func ReindexTree(path string) (err error) {
 func RefreshFileTree() {
 	WaitForWritingFiles()
 
+	util.PushEndlessProgress(Conf.Language(35))
 	if err := sql.InitDatabase(true); nil != err {
 		util.PushErrMsg(fmt.Sprintf(Conf.Language(85), err), 5000)
 		return
 	}
 	treenode.InitBlockTree(true)
 
-	util.PushEndlessProgress(Conf.Language(35))
 	openedBoxes := Conf.GetOpenedBoxes()
 	for _, openedBox := range openedBoxes {
 		openedBox.Index(true)
diff --git a/kernel/sql/database.go b/kernel/sql/database.go
index b1d4d57f5..69a837545 100644
--- a/kernel/sql/database.go
+++ b/kernel/sql/database.go
@@ -59,6 +59,10 @@ func init() {
 func InitDatabase(forceRebuild bool) (err error) {
 	util.IncBootProgress(2, "Initializing database...")
 
+	if forceRebuild {
+		WaitForWritingDatabase()
+	}
+
 	initDBConnection()
 
 	if !forceRebuild {