Fix opening articles pages (sequel of issue ViennaRSS#117)

barijaona · Jan 5, 2013 · 986b411 · 986b411
1 parent dca9215
commit 986b411
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/AppController.m b/src/AppController.m
@@ -1310,7 +1310,13 @@ -(IBAction)openWebLocation:(id)sender
  */
 -(void)openURLFromString:(NSString *)urlString inPreferredBrowser:(BOOL)openInPreferredBrowserFlag
 {
-	[self openURL:[NSURL URLWithString:urlString] inPreferredBrowser:openInPreferredBrowserFlag];
+	NSURL * theURL = [NSURL URLWithString:urlString];
+	if (theURL == nil)
+	{
+		NSString * escapedText = [urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+		theURL = [NSURL URLWithString:escapedText];
+	}
+	[self openURL:theURL inPreferredBrowser:openInPreferredBrowserFlag];
 }
 
 /** openURLs
@@ -2502,8 +2508,13 @@ -(void)viewArticlePages:(id)sender inPreferredBrowser:(BOOL)usePreferredBrowser
 			if (currentArticle && ![[currentArticle link] isBlank])
             {
                 [articlesWithLinks addObject:currentArticle];
-                NSString * escapedText = [[currentArticle link] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-				[urls addObject:[NSURL URLWithString:escapedText]];
+                NSURL * theURL = [NSURL URLWithString:[currentArticle link]];
+                if (theURL == nil)
+                {
+                	NSString * escapedText = [[currentArticle link] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+                	theURL = [NSURL URLWithString:escapedText];
+                }
+                [urls addObject:theURL];
             }
 		}
 		[self openURLs:urls inPreferredBrowser:usePreferredBrowser];