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

🎨 Improve system exit

Browse source
This commit is contained in:
Daniel 2023-06-09 20:36:21 +08:00
parent e99035d727
commit e28d0dc075
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kernel/model/conf.go
View file

@ -501,16 +501,17 @@ func Close(force bool, execInstallPkg int) (exitCode int) {
clearPortJSON() clearPortJSON()
util.UnlockWorkspace() util.UnlockWorkspace()
go func() {
time.Sleep(500 * time.Millisecond) time.Sleep(500 * time.Millisecond)
if waitSecondForExecInstallPkg { if waitSecondForExecInstallPkg {
util.PushMsg(Conf.Language(130), 1000*5) util.PushMsg(Conf.Language(130), 1000*5)
// 桌面端退出拉起更新安装时有时需要重启两次 https://github.com/siyuan-note/siyuan/issues/6544 // 桌面端退出拉起更新安装时有时需要重启两次 https://github.com/siyuan-note/siyuan/issues/6544
// 这里多等待一段时间，等待安装程序启动 // 这里多等待一段时间，等待安装程序启动
time.Sleep(5 * time.Second) time.Sleep(4 * time.Second)
} }
logging.LogInfof("exited kernel") logging.LogInfof("exited kernel")
util.WebSocketServer.Close() util.WebSocketServer.Close()
go func() {
time.Sleep(500 * time.Millisecond)
os.Exit(logging.ExitCodeOk) os.Exit(logging.ExitCodeOk)
}() }()
return return