From 7fef19d572427e53f8bbb0002e5b5a9c79094e5c Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Sun, 28 Nov 2021 12:49:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dhttps=5Fproxy=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F=E6=97=A0=E6=B3=95=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/src/shell/scripts/set-system-proxy/index.js | 6 ++++--
 packages/gui/src/background.js                            | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/shell/scripts/set-system-proxy/index.js b/packages/core/src/shell/scripts/set-system-proxy/index.js
index 52772b54..1f4394a3 100644
--- a/packages/core/src/shell/scripts/set-system-proxy/index.js
+++ b/packages/core/src/shell/scripts/set-system-proxy/index.js
@@ -71,8 +71,10 @@ async function _winSetProxy (exec, ip, port, setEnv) {
   const proxyPath = extraPath.getProxyExePath()
   await execFile(proxyPath, ['global', `${ip}:${port}`, lanIpStr])
 
-  if (setEnv == null) {
+  if (setEnv) {
+    log.info('同时设置 https_proxy')
     try {
+      await exec('echo \'test\'')
       await exec('echo \'test\'')
       await exec(`setx HTTPS_PROXY "http://${ip}:${port}/"`)
       //  await addClearScriptIni()
@@ -94,7 +96,7 @@ const executor = {
     } else {
       // 设置代理
 
-      log.info('设置代理', ip, port)
+      log.info('设置代理', ip, port, setEnv)
       return _winSetProxy(exec, ip, port, setEnv)
     }
   },
diff --git a/packages/gui/src/background.js b/packages/gui/src/background.js
index 98cfbe49..95b4f3b9 100644
--- a/packages/gui/src/background.js
+++ b/packages/gui/src/background.js
@@ -119,7 +119,9 @@ function showWin () {
   if (win) {
     win.show()
   }
-  app.dock.show()
+  if (app.dock) {
+    app.dock.show()
+  }
 }
 
 function changeAppConfig (config) {