Merge branch 'paracycle-feature/accept-non-file-uris'

themucha · May 27, 2014 · 7bd8ac5 · 7bd8ac5
2 parents d3fe4a3 + 21065dc
commit 7bd8ac5
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Terminal Notifier/AppDelegate.m b/Terminal Notifier/AppDelegate.m
@@ -205,10 +205,12 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification;
 
 - (NSImage*)getImageFromURL:(NSString *) url;
 {
-  if(!contains(url, @"file://")){ // Prefix file:// if not present
+  NSURL *imageURL = [NSURL URLWithString:url];
+  if([[imageURL scheme] length] == 0){
+    // Prefix 'file://' if no scheme
     url = [NSString stringWithFormat:@"%@%@", @"file://", url];
+    imageURL = [NSURL URLWithString:url];
   }
-  NSURL *imageURL = [NSURL URLWithString:url];
   return [[NSImage alloc] initWithContentsOfURL:imageURL];
 }