Merge mac-release.

2019-09-07 20:59:19 -07:00 · 2019-09-07 20:59:19 -07:00 · ecc8854f59
parent 0f753a66cc 53370ff0d3
commit ecc8854f59
2 changed files with 8 additions and 2 deletions
--- a/Shared/Data/ArticleUtilities.swift
+++ b/Shared/Data/ArticleUtilities.swift
@ -47,7 +47,13 @@ extension Article {
 	}
 	
 	var preferredLink: String? {
-		return url ?? externalURL
+		if let url = url, !url.isEmpty {
+			return url
+		}
+		if let externalURL = externalURL, !externalURL.isEmpty {
+			return externalURL
+		}
+		return nil
 	}
 	
 	var body: String? {
--- a/xcconfig/NetNewsWire_macapp_target.xcconfig
+++ b/xcconfig/NetNewsWire_macapp_target.xcconfig
@ -38,4 +38,4 @@ CODE_SIGN_ENTITLEMENTS = Mac/Resources/NetNewsWire.entitlements
 INFOPLIST_FILE = Mac/Resources/Info.plist
 LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks
 PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire-Evergreen
-PRODUCT_NAME = NetNewsWire
+PRODUCT_NAME = NetNewsWire