Merge branch 'develop'

Author: qiuyuzhou

ShadowsocksX-NG/Base.lproj/PreferencesWinController.xib

@@ -190,7 +190,7 @@
                                         </textField>
                                         <button translatesAutoresizingMaskIntoConstraints="NO" id="tGd-pe-2xJ">
                                             <rect key="frame" x="240" y="108" width="222" height="18"/>
-                                            <buttonCell key="cell" type="check" title="Enable Udp Replay" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="R3v-iN-zu8">
+                                            <buttonCell key="cell" type="check" title="Enable UDP Relay" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="R3v-iN-zu8">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>

ShadowsocksX-NG/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.5.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>1</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

ShadowsocksX-NG/LaunchAgentUtils.swift

@@ -151,7 +151,9 @@ func SyncSSLocal() {
     changed = changed || generateSSLocalLauchAgentPlist()
     let mgr = ServerProfileManager.instance
     if mgr.activeProfileId != nil {
-        changed = changed || writeSSLocalConfFile((mgr.getActiveProfile()?.toJsonConfig())!)
+        if let profile = mgr.getActiveProfile() {
+            changed = changed || writeSSLocalConfFile((profile.toJsonConfig()))
+        }
 
         let on = UserDefaults.standard.bool(forKey: "ShadowsocksOn")
         if on {