From 8ae50cdd56a4fdb59dc6d393830443014d5b679f Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Thu, 5 Jan 2023 11:35:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?:art:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4?=
 =?UTF-8?q?=20https://github.com/siyuan-note/siyuan/issues/4642?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/util/working_mobile.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/util/working_mobile.go b/kernel/util/working_mobile.go
index bae5e71e8..57dabdf4d 100644
--- a/kernel/util/working_mobile.go
+++ b/kernel/util/working_mobile.go
@@ -90,7 +90,7 @@ func initWorkspaceDirMobile(workspaceBaseDir string) {
 			}
 			if oldConf && oldData && oldTemp {
 				for _, entry := range entries {
-					if "home" == entry.Name() {
+					if "home" == entry.Name() || "siyuan" == entry.Name() {
 						continue
 					}
 

From a2a0054dccff118535c4051213f5351d257e8724 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Thu, 5 Jan 2023 11:45:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?:art:=20=E6=A1=8C=E9=9D=A2=E7=AB=AF?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=90=8C=E6=97=B6=E6=89=93=E5=BC=80=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4=20https://github.?=
 =?UTF-8?q?com/siyuan-note/siyuan/issues/4567?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/electron/main.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/electron/main.js b/app/electron/main.js
index 68b716bd4..5ae5e785d 100644
--- a/app/electron/main.js
+++ b/app/electron/main.js
@@ -468,6 +468,16 @@ const initKernel = (workspace, lang) => {
                 '⚠️ 无法读写块树文件 Failed to access blocktree file',
                 `<div>块树文件正在被其他程序锁定或者已经损坏，请删除 工作空间/temp/ 文件夹后重启</div><div>The block tree file is being locked by another program or is corrupted, please delete the workspace/temp/ folder and restart.</div>`)
               break
+            case 24:
+              showErrorWindow(
+                '⚠️ 工作空间已被锁定 The workspace is locked',
+                `<div>该工作空间正在被使用。</div><div>The workspace is in use.</div>`)
+              break
+            case 25:
+              showErrorWindow(
+                '⚠️ 创建工作空间目录失败 Failed to create workspace directory',
+                `<div>创建工作空间目录失败。</div><div>Failed to create workspace directory.</div>`)
+              break
             case 0:
             case 1: // Fatal error
               break