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

🎨 使用第三方同步盘时弹出提示并退出内核 https://github.com/siyuan-note/siyuan/issues/7683

Browse source
This commit is contained in:
Liang Ding 2023-03-16 22:55:32 +08:00
parent ad0b625db8
commit d15200957d
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
4 changed files with 121 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kernel/model/conf.go
View file

@ -32,7 +32,7 @@ import (
"github.com/88250/lute"
"github.com/88250/lute/ast"
"github.com/Xuanwo/go-locale"
humanize "github.com/dustin/go-humanize"
"github.com/dustin/go-humanize"
"github.com/getsentry/sentry-go"
"github.com/siyuan-note/filelock"
"github.com/siyuan-note/logging"
@ -58,7 +58,8 @@ type AppConf struct {
Editor *conf.Editor `json:"editor"` // 编辑器配置
Export *conf.Export `json:"export"` // 导出配置
Graph *conf.Graph `json:"graph"` // 关系图配置
UILayout *conf.UILayout `json:"uiLayout"` // 界面布局
UILayout *conf.UILayout `json:"uiLayout"` // 界面布局，v2.8.0 后这个字段不再使用
UILayouts []*conf.UILayout `json:"uiLayouts"` // 界面布局列表
UserData string `json:"userData"` // 社区用户信息，对 User 加密存储
User *conf.User `json:"-"` // 社区用户内存结构，不持久化
Account *conf.Account `json:"account"` // 帐号配置
@ -149,6 +150,9 @@ func InitConf() {
if nil == Conf.UILayout {
Conf.UILayout = &conf.UILayout{}
}
if 1 > len(Conf.UILayouts) {
Conf.UILayouts = []*conf.UILayout{}
}
if nil == Conf.Keymap {
Conf.Keymap = &conf.Keymap{}
}