Fixes bug #1137

shadowsocks · Oct 29, 2019 · 9b204d1 · 9b204d1
1 parent 5cb98a1
commit 9b204d1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/ShadowsocksX-NG/PreferencesWindowController.swift b/ShadowsocksX-NG/PreferencesWindowController.swift
@@ -130,6 +130,7 @@ class PreferencesWindowController: NSWindowController
     }
 
     @IBAction func cancel(_ sender: NSButton) {
+        profileMgr.reload()
         window?.performClose(self)
     }
 

diff --git a/ShadowsocksX-NG/ServerProfileManager.swift b/ShadowsocksX-NG/ServerProfileManager.swift
@@ -12,12 +12,10 @@ class ServerProfileManager: NSObject {
 
     static let instance:ServerProfileManager = ServerProfileManager()
 
-    var profiles:[ServerProfile]
+    var profiles:[ServerProfile] = [ServerProfile]()
     var activeProfileId: String?
 
     fileprivate override init() {
-        profiles = [ServerProfile]()
-
         let defaults = UserDefaults.standard
         if let _profiles = defaults.array(forKey: "ServerProfiles") {
             for _profile in _profiles {
@@ -50,6 +48,19 @@ class ServerProfileManager: NSObject {
         }
     }
 
+    func reload() {
+        profiles.removeAll()
+
+        let defaults = UserDefaults.standard
+        if let _profiles = defaults.array(forKey: "ServerProfiles") {
+            for _profile in _profiles {
+                let profile = ServerProfile.fromDictionary(_profile as! [String: Any])
+                profiles.append(profile)
+            }
+        }
+        activeProfileId = defaults.string(forKey: "ActiveServerProfileId")
+    }
+
     func getActiveProfile() -> ServerProfile? {
         if let id = activeProfileId {
             for p in profiles {
-Original file line number
+Diff line change
@@ Expand Up / @@ -130,6 +130,7 @@ class PreferencesWindowController: NSWindowController @@
         }
         @IBAction func cancel(_ sender: NSButton) {
+            profileMgr.reload()
             window?.performClose(self)
         }
@@ Expand Down @@