Merge branch 'develop'

Author: gee1k

uPic/PreferencesWindow/ConfigView/ConfigView.swift

@@ -131,16 +131,17 @@ class ConfigView: NSView {
     }
 
     @objc func saveHostSettings(notification: Notification) {
-        self.removeObserver()
         guard let userInfo = notification.userInfo else {
             print("No userInfo found in notification")
             return
         }
 
         let domain = userInfo["domain"] as? String ?? ""
+        let folder = userInfo["folder"] as? String ?? ""
         let saveKey = userInfo["saveKey"] as? String ?? HostSaveKey.dateFilename.rawValue
 
         self.data?.setValue(domain, forKey: "domain")
+        self.data?.setValue(folder, forKey: "folder")
         self.data?.setValue(saveKey, forKey: "saveKey")
 
         domainField?.stringValue = domain

uPic/PreferencesWindow/ConfigView/Views/CustomConfigView.swift

@@ -188,6 +188,22 @@ class CustomConfigView: ConfigView {
 
     }
 
+    @objc override func saveHostSettings(notification: Notification) {
+        self.removeObserver()
+        guard let userInfo = notification.userInfo else {
+            print("No userInfo found in notification")
+            return
+        }
+        
+        let domain = userInfo["domain"] as? String ?? ""
+        let saveKey = userInfo["saveKey"] as? String ?? HostSaveKey.dateFilename.rawValue
+        
+        self.data?.setValue(domain, forKey: "domain")
+        self.data?.setValue(saveKey, forKey: "saveKey")
+        
+        domainField?.stringValue = domain
+    }
+    
     @objc func openCustomConfigSheet(_ sender: NSButton) {
         guard let data = self.data as? CustomHostConfig else {
             return

uPic/Supporting Files/Info.plist

@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.7.3</string>
+	<string>0.7.4</string>
 	<key>CFBundleVersion</key>
-	<string>20190720</string>
+	<string>20190721</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>