From 6ee426e0ee88a37d9fc94038e865b5e99ec0b6ce Mon Sep 17 00:00:00 2001 From: ericwa Date: Wed, 25 Jan 2012 23:25:14 +0000 Subject: [PATCH] * Source/NSImage.m (+imageNamed:): Don't try to look up path if called with nil (just return nil). git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34632 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 7 ++++++- Source/NSImage.m | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 85c7b20b0..aa09e0d8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ -2012-01-25 Eric Wasylishen +2012-01-25 Eric Wasylishen + + * Source/NSImage.m (+imageNamed:): Don't try to look up path + if called with nil (just return nil). + +2012-01-25 Eric Wasylishen * Source/NSClipView.m: Disable copy-on-scroll until after release diff --git a/Source/NSImage.m b/Source/NSImage.m index 8bff78eea..bda01311c 100644 --- a/Source/NSImage.m +++ b/Source/NSImage.m @@ -209,7 +209,7 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep) */ [imageLock lock]; image = (NSImage*)[nameDict objectForKey: aName]; - if (image == nil) + if (image == nil && aName != nil) { NSString *path = [self _pathForImageNamed: aName];