Merge commit 'fc11cc78fd9ad96d026485e07e643c751ad4669b' into develop

This commit is contained in:
Charlie Qiu
2016-10-18 16:07:05 +08:00

View File

@ -385,7 +385,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
showRunningModeMenuItem.state = defaults.bool(forKey: "ShowRunningModeOnStatusBar") ? 1 : 0
var serverMenuText = "Servers".localized
for v in defaults.array(forKey: "ServerProfiles")! {
if let serverProfiles = defaults.array(forKey: "ServerProfiles") {
for v in serverProfiles {
let profile = v as! [String:Any]
if profile["Id"] as! String == defaults.string(forKey: "ActiveServerProfileId")! {
var profileName :String
@ -397,6 +398,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
serverMenuText = "\(serverMenuText) - \(profileName)"
}
}
}
serversMenuItem.title = serverMenuText
if mode == "auto" {