fix crash reported in #640; other insignificant changes
This commit is contained in:
parent
9423e89aec
commit
27c2833ec3
|
@ -63,7 +63,7 @@
|
||||||
if (fQuitting)
|
if (fQuitting)
|
||||||
{
|
{
|
||||||
[self badge: [NSImage imageNamed: @"QuitBadge.png"] string: NSLocalizedString(@"Quitting", "Dock Badger -> quit")
|
[self badge: [NSImage imageNamed: @"QuitBadge.png"] string: NSLocalizedString(@"Quitting", "Dock Badger -> quit")
|
||||||
atHeight: (rect.size.height - [[NSImage imageNamed: @"UploadBadge"] size].height) * 0.5];
|
atHeight: (rect.size.height - [[NSImage imageNamed: @"QuitBadge.png"] size].height) * 0.5];
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -684,7 +684,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
|
||||||
|
|
||||||
- (void) openFiles: (NSArray *) filenames addType: (addType) type forcePath: (NSString *) path
|
- (void) openFiles: (NSArray *) filenames addType: (addType) type forcePath: (NSString *) path
|
||||||
{
|
{
|
||||||
#warning make submethod
|
#warning checks could probably be removed, since location is checked when starting
|
||||||
if (!path && [fDefaults boolForKey: @"UseIncompleteDownloadFolder"]
|
if (!path && [fDefaults boolForKey: @"UseIncompleteDownloadFolder"]
|
||||||
&& access([[[fDefaults stringForKey: @"IncompleteDownloadFolder"] stringByExpandingTildeInPath] UTF8String], 0))
|
&& access([[[fDefaults stringForKey: @"IncompleteDownloadFolder"] stringByExpandingTildeInPath] UTF8String], 0))
|
||||||
{
|
{
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -333,7 +333,8 @@
|
||||||
}
|
}
|
||||||
else;
|
else;
|
||||||
|
|
||||||
[controlView updateTrackingAreas];
|
if ([NSApp isOnLeopardOrBetter])
|
||||||
|
[controlView updateTrackingAreas];
|
||||||
|
|
||||||
return YES;
|
return YES;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue