From 6b298f3f24ece03849b405a1a052042bc2a9e02f Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Sat, 14 Jan 2023 11:13:02 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E6=A1=8C=E9=9D=A2=E7=AB=AF=E5=BF=AB?=
 =?UTF-8?q?=E6=8D=B7=E6=96=B9=E5=BC=8F=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=20`--workspace`=20=E5=8F=98=E6=9B=B4=20Fix?=
 =?UTF-8?q?=20https://github.com/siyuan-note/siyuan/issues/7070?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/electron/main.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/electron/main.js b/app/electron/main.js
index 5bc1f9cba..8f0f921c9 100644
--- a/app/electron/main.js
+++ b/app/electron/main.js
@@ -52,10 +52,8 @@ try {
   }
 } catch (e) {
   console.error(e)
-  require('electron').
-    dialog.
-    showErrorBox('创建配置目录失败 Failed to create config directory',
-      '思源需要在用户家目录下创建配置文件夹（~/.config/siyuan），请确保该路径具有写入权限。\n\nSiYuan needs to create a configuration folder (~/.config/siyuan) in the user\'s home directory. Please make sure that the path has write permissions.')
+  require('electron').dialog.showErrorBox('创建配置目录失败 Failed to create config directory',
+    '思源需要在用户家目录下创建配置文件夹（~/.config/siyuan），请确保该路径具有写入权限。\n\nSiYuan needs to create a configuration folder (~/.config/siyuan) in the user\'s home directory. Please make sure that the path has write permissions.')
   app.exit()
 }
 
@@ -901,12 +899,17 @@ app.on('second-instance', (event, argv) => {
     })
     return
   }
+
   const siyuanURL = argv.find((arg) => arg.startsWith('siyuan://'))
   workspaces.forEach(item => {
     if (item.browserWindow && !item.browserWindow.isDestroyed() && siyuanURL) {
       item.browserWindow.webContents.send('siyuan-openurl', siyuanURL)
     }
   })
+
+  if (!siyuanURL && 0 < workspaces.length) {
+    showWindow(workspaces[0].browserWindow)
+  }
 })
 
 app.on('activate', () => {