From 4f4d5e21c28a5c878cb2b78ce66899b73fed18a6 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Wed, 7 Dec 2022 21:08:22 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E6=A1=8C=E9=9D=A2=E7=AB=AF=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E8=8E=B7=E5=8F=96=E5=86=85=E6=A0=B8=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=BC=B9=E7=AA=97=E6=8F=90=E7=A4=BA=20Fix=20?=
 =?UTF-8?q?https://github.com/siyuan-note/siyuan/issues/6812?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/electron/main.js b/app/electron/main.js
index faae062be..1c7ab3851 100644
--- a/app/electron/main.js
+++ b/app/electron/main.js
@@ -606,13 +606,19 @@ const initKernel = (initData) => {
           count++
           if (64 < count) {
             writeLog('get kernel port failed [pid=' + kernelProcessPid + '], try to use 6806')
-            return kernelPort
+            return
           }
         }
       }
     }
 
     kernelPort = await getKernelPort()
+    if (!kernelPort) {
+      showErrorWindow('⚠️ 获取内核服务端口失败 Failed to get kernel serve port',
+        '<div>获取内核服务端口失败，请确保程序拥有网络权限并不受防火墙和杀毒软件阻止。</div><div>Failed to get kernel serve port, please make sure the program has network permissions and is not blocked by firewalls and antivirus software.</div>')
+      bootWindow.destroy()
+      resolve(false)
+    }
     writeLog("got kernel port [" + kernelPort + "]")
 
     let gotVersion = false
@@ -713,7 +719,7 @@ app.whenReady().then(() => {
 
     // 改进桌面端初始化时使用的外观语言 https://github.com/siyuan-note/siyuan/issues/6803
     let languages = app.getPreferredSystemLanguages();
-    let language = languages && 0 < languages.length && "zh-Hans-CN" === languages[0] ? "zh_CN": "en_US";
+    let language = languages && 0 < languages.length && "zh-Hans-CN" === languages[0] ? "zh_CN" : "en_US";
     firstOpenWindow.loadFile(
       initHTMLPath, {
         query: {