actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.h
+2 -2
View File
@@ -21,8 +21,8 @@ public:
RageFile f; RageFile f;
CString data; CString data;
f.Open( "Data/splash.png" ); if( f.Open("Data/splash.png") )
f.Read( data ); f.Read( data );
MakeNewCocoaWindow( data.data(), data.length() ); MakeNewCocoaWindow( data.data(), data.length() );
} }
~LoadingWindow_Cocoa() { DisposeOfCocoaWindow(); } ~LoadingWindow_Cocoa() { DisposeOfCocoaWindow(); }
stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.m
+8 -2
View File
@@ -7,8 +7,14 @@ static NSTextView *text;
void MakeNewCocoaWindow( const void *data, unsigned length ) void MakeNewCocoaWindow( const void *data, unsigned length )
{ {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSData *d = [NSData dataWithBytes:data length:length]; NSImage *image = nil;
NSImage *image = [[[NSImage alloc] initWithData:d] autorelease];
if( length )
{
NSData *d = [NSData dataWithBytes:data length:length];
image = [[[NSImage alloc] initWithData:d] autorelease];
}
if( !image ) if( !image )
image = [NSImage imageNamed:@"splash.png"]; image = [NSImage imageNamed:@"splash.png"];