Better support for setting errors inside -dataOfType:error: and -readFromData:ofType:error:.

Previously, under GNUstep, NSLocalizedFailureReasonKey was ignored when
presented with +[NSAlert alertWithError]. Additionally, error set in
-readFromData:ofType:error: was overwritten by two different methods in the
file reading chain.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@38483 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
ivucica 2015-05-10 19:10:56 +00:00
parent acf05990fa
commit daa905a169
3 changed files with 24 additions and 4 deletions

View file

@ -1789,10 +1789,17 @@ void NSBeginInformationalAlertSheet(NSString *title,
{
NSArray *options;
NSUInteger count;
NSString *errorText;
errorText = [error localizedFailureReason];
if (errorText == nil)
{
errorText = [error localizedDescription];
}
options = [error localizedRecoveryOptions];
count = [options count];
return [self alertWithMessageText: [error localizedDescription]
return [self alertWithMessageText: errorText
defaultButton: (count > 0) ? [options objectAtIndex: 0] : nil
alternateButton: (count > 1) ? [options objectAtIndex: 1] : nil
otherButton: (count > 2) ? [options objectAtIndex: 2] : nil