xuemingqiang/ShadowsocksX-NG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #92 from linuxbelletian/master

Browse Source 
defaults.array(forKey: "ServerProfiles")  would return nil ,but not h…
This commit is contained in:
Qiu Yuzhou
2016-10-18 16:04:10 +08:00
committed by GitHub
parent 8ba816300c 22d654dd69
commit fc11cc78fd
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ShadowsocksX-NG/AppDelegate.swift
View File

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