Browse Source

:art: 工作空间/conf/conf.json 文件读写不再加锁 Fix https://github.com/siyuan-note/siyuan/issues/5664

Liang Ding 2 years ago
parent
commit
b467fc6698
2 changed files with 1 additions and 1 deletions
  1. 0 0
      app/stage/protyle/js/lute/lute.min.js
  2. 1 1
      kernel/model/conf.go

File diff suppressed because it is too large
+ 0 - 0
app/stage/protyle/js/lute/lute.min.js


+ 1 - 1
kernel/model/conf.go

@@ -415,7 +415,7 @@ func (conf *AppConf) Save() {
 
 
 func (conf *AppConf) save0(data []byte) {
 func (conf *AppConf) save0(data []byte) {
 	confPath := filepath.Join(util.ConfDir, "conf.json")
 	confPath := filepath.Join(util.ConfDir, "conf.json")
-	if err := filelock.LockFileWrite(confPath, data); nil != err {
+	if err := filelock.NoLockFileWrite(confPath, data); nil != err {
 		logging.LogFatalf("write conf [%s] failed: %s", confPath, err)
 		logging.LogFatalf("write conf [%s] failed: %s", confPath, err)
 	}
 	}
 }
 }

Some files were not shown because too many files changed in this diff