FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't enable the Add button unless all conditions for an Add have been met. Fixes #2555

This commit is contained in:
Maurice Parker 2020-11-05 10:34:26 -06:00
parent 694bcb610f
commit e8238c03f2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Mac/MainWindow/AddFeed/AddWebFeedWindowController.swift
View File

@ -96,7 +96,7 @@ class AddWebFeedWindowController : NSWindowController, AddFeedWindowController {
return return
} }
let container = selectedContainer()! guard let container = selectedContainer() else { return }
AddWebFeedDefaultContainer.saveDefaultContainer(container) AddWebFeedDefaultContainer.saveDefaultContainer(container)
delegate?.addFeedWindowController(self, userEnteredURL: url, userEnteredTitle: userEnteredTitle, container: container) delegate?.addFeedWindowController(self, userEnteredURL: url, userEnteredTitle: userEnteredTitle, container: container)
@ -122,7 +122,7 @@ class AddWebFeedWindowController : NSWindowController, AddFeedWindowController {
private extension AddWebFeedWindowController { private extension AddWebFeedWindowController {
private func updateUI() { private func updateUI() {
addButton.isEnabled = urlTextField.stringValue.mayBeURL addButton.isEnabled = urlTextField.stringValue.mayBeURL && selectedContainer() != nil
} }
func cancelSheet() { func cancelSheet() {
@ -130,6 +130,7 @@ private extension AddWebFeedWindowController {
} }
func selectedContainer() -> Container? { func selectedContainer() -> Container? {
guard folderPopupButton.selectedItem?.isEnabled ?? false else { return nil }
return folderPopupButton.selectedItem?.representedObject as? Container return folderPopupButton.selectedItem?.representedObject as? Container
} }
} }