Fix crash if Data/splash.png is not found.

This commit is contained in:
Steve Checkoway
2005-12-29 11:35:10 +00:00
parent 7dd0014caa
commit 9d4719c112
2 changed files with 10 additions and 4 deletions
@@ -21,8 +21,8 @@ public:
RageFile f;
CString data;
f.Open( "Data/splash.png" );
f.Read( data );
if( f.Open("Data/splash.png") )
f.Read( data );
MakeNewCocoaWindow( data.data(), data.length() );
}
~LoadingWindow_Cocoa() { DisposeOfCocoaWindow(); }
@@ -7,8 +7,14 @@ static NSTextView *text;
void MakeNewCocoaWindow( const void *data, unsigned length )
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSData *d = [NSData dataWithBytes:data length:length];
NSImage *image = [[[NSImage alloc] initWithData:d] autorelease];
NSImage *image = nil;
if( length )
{
NSData *d = [NSData dataWithBytes:data length:length];
image = [[[NSImage alloc] initWithData:d] autorelease];
}
if( !image )
image = [NSImage imageNamed:@"splash.png"];