From 9aaf6940e254b9cbe67f9a9ac50837705c5abed3 Mon Sep 17 00:00:00 2001
From: qinyuhang <qinyuhangxiaoxiang@gmail.com>
Date: Thu, 8 Sep 2016 18:47:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=8E=B0=E5=9C=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=AE=9E=E9=99=85=E4=BD=BF=E7=94=A8=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

菜单现在显示实际使用中的服务器名
---
 ShadowsocksX-NG/AppDelegate.swift | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ShadowsocksX-NG/AppDelegate.swift b/ShadowsocksX-NG/AppDelegate.swift
index 4f2f90f..ed606ee 100644
--- a/ShadowsocksX-NG/AppDelegate.swift
+++ b/ShadowsocksX-NG/AppDelegate.swift
@@ -333,6 +333,17 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
     func updateRunningModeMenu() {
         let defaults = NSUserDefaults.standardUserDefaults()
         let mode = defaults.stringForKey("ShadowsocksRunningMode")
+        var serverMenuText = "Servers".localized
+        for i in defaults.arrayForKey("ServerProfiles")! {
+            if i["Id"] as! String == defaults.stringForKey("ActiveServerProfileId")! {
+                if i["Remark"] as! String != "" {
+                    serverMenuText = i["Remark"] as! String
+                } else {
+                    serverMenuText = i["ServerHost"] as! String
+                }
+            }
+        }
+        serversMenuItem.title = serverMenuText
         if mode == "auto" {
             proxyMenuItem.title = "Proxy - Auto By PAC".localized
             autoModeMenuItem.state = 1