From eb3c69f4d09859824e088f1d4ed5275313f37f8b Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Wed, 6 Feb 2019 21:18:22 -0800
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20write=20"Untitled"=20to=20Subsc?=
 =?UTF-8?q?riptions.opml=20=20when=20a=20feed=20lacks=20a=20name=20or=20ed?=
 =?UTF-8?q?itedName=20=E2=80=94=20=E2=80=9CUntitled=E2=80=9D=20is=20a=20lo?=
 =?UTF-8?q?calizable,=20display-only=20string,=20not=20something=20to=20st?=
 =?UTF-8?q?ore=20in=20OPML.=20Fix=20#527.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Frameworks/Account/Feed.swift | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Frameworks/Account/Feed.swift b/Frameworks/Account/Feed.swift
index 36c1e6cac..945978437 100644
--- a/Frameworks/Account/Feed.swift
+++ b/Frameworks/Account/Feed.swift
@@ -231,8 +231,18 @@ public final class Feed: DisplayNameProvider, Renamable, UnreadCountProvider, Ha
 extension Feed: OPMLRepresentable {
 
 	public func OPMLString(indentLevel: Int) -> String {
-
-		let escapedName = nameForDisplay.rs_stringByEscapingSpecialXMLCharacters()
+		// https://github.com/brentsimmons/NetNewsWire/issues/527
+		// Don’t use nameForDisplay because that can result in a feed name "Untitled" written to disk,
+		// which NetNewsWire may take later to be the actual name.
+		var nameToUse = editedName
+		if nameToUse == nil {
+			nameToUse = name
+		}
+		if nameToUse == nil {
+			nameToUse = ""
+		}
+		let escapedName = nameToUse!.rs_stringByEscapingSpecialXMLCharacters()
+		
 		var escapedHomePageURL = ""
 		if let homePageURL = homePageURL {
 			escapedHomePageURL = homePageURL.rs_stringByEscapingSpecialXMLCharacters()