Merge branch 'henry0312-imageURL'

julienXX · julienXX · commit a1f2c7ce3230 · 2014-07-25T10:20:59.000+02:00
diff --git a/Terminal Notifier/AppDelegate.m b/Terminal Notifier/AppDelegate.m
@@ -208,8 +208,7 @@ - (NSImage*)getImageFromURL:(NSString *) url;
   NSURL *imageURL = [NSURL URLWithString:url];
   if([[imageURL scheme] length] == 0){
     // Prefix 'file://' if no scheme
-    url = [NSString stringWithFormat:@"%@%@", @"file://", url];
-    imageURL = [NSURL URLWithString:url];
+    imageURL = [NSURL fileURLWithPath:url];
   }
   return [[NSImage alloc] initWithContentsOfURL:imageURL];
 }

Original file line number	Diff line number	Diff line change
`@@ -208,8 +208,7 @@ - (NSImage)getImageFromURL:(NSString ) url;`
`208`	`208`	`NSURL *imageURL = [NSURL URLWithString:url];`
`209`	`209`	`if([[imageURL scheme] length] == 0){`
`210`	`210`	`// Prefix 'file://' if no scheme`
`211`		`- url = [NSString stringWithFormat:@"%@%@", @"file://", url];`
`212`		`- imageURL = [NSURL URLWithString:url];`
	`211`	`+ imageURL = [NSURL fileURLWithPath:url];`
`213`	`212`	`}`
`214`	`213`	`return [[NSImage alloc] initWithContentsOfURL:imageURL];`
`215`	`214`	`}`