Merge pull request #127 from avwo/dev

Release v1.6.5

Author: avwo

CHANGELOG.md

@@ -1,4 +1,7 @@
 > Get the latest release: https://github.com/avwo/whistle-client/releases
+# v1.6.5
+1. fix: https://github.com/avwo/whistle-client/issues/126
+2. feat: update whistle to v2.10.4
 
 # v1.6.4
 1. fix: https://github.com/avwo/whistle-client/issues/124

lib/menu.js

@@ -156,12 +156,14 @@ const updateTitle = (force) => {
   curTitle = title;
   title = `${title}${getEnabledRules()}`;
   const win = getWin();
-  if (win) {
-    win.setTitle(title);
-  }
-  if (tray) {
-    tray.setToolTip(title);
-  }
+  try {
+    if (win) {
+      win.setTitle(title);
+    }
+    if (tray) {
+      tray.setToolTip(title);
+    }
+  } catch (e) {}
 };
 
 const setStartAtLogin = (startAtLogin) => {
@@ -467,12 +469,6 @@ exports.create = async () => {
   updateHideFromDock();
 
   let autoSet = storage.getProperty('autoSetProxy');
-  if (autoSet) {
-    await enableSystemProxy();
-  } else {
-    setEnabled(false);
-  }
-  updateTitle();
   const detectProxy = () => {
     if (isSettingProxy || !isEnabled()) {
       autoSet = false;
@@ -503,7 +499,16 @@ exports.create = async () => {
       setTimeout(detectProxy, INTERVAL);
     });
   };
-  setTimeout(detectProxy, autoSet ? 200 : INTERVAL);
+  if (autoSet) {
+    setTimeout(async () => {
+      await enableSystemProxy();
+      setTimeout(detectProxy, 200);
+    }, 1000);
+  } else {
+    setEnabled(false);
+    setTimeout(detectProxy, INTERVAL);
+  }
+  updateTitle();
   nativeTheme.on('updated', () => {
     const curTheme = getTheme();
     if (theme === curTheme) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Whistle",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "description": "Whistle Web Debugging Proxy",
   "main": "./lib/index.js",
   "author": "avenwu <avwu@qq.com>",
@@ -92,7 +92,7 @@
     "find-bar": "^0.1.3",
     "fs-extra": "^11.1.1",
     "npminstall": "^7.9.0",
-    "whistle": "^2.10.3",
+    "whistle": "^2.10.4",
     "whistle.proxyauth": "^1.2.0"
   }
 }