gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 08:41:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ensure defaults are synchronized before a reset.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@14348 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2002-08-27 13:47:58 +00:00
parent 99be9b9e68
commit a9de34eb69
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/NSCalendarDate.m
View file

@ -1689,9 +1689,12 @@ static inline int getDigits(const char *from, char *to, int limit)
*/ */
if ([date isKindOfClass: [NSCalendarDate class]]) if ([date isKindOfClass: [NSCalendarDate class]])
tmp = (NSCalendarDate*)RETAIN(date); tmp = (NSCalendarDate*)RETAIN(date);
else else if ([date isKindOfClass: [NSDate class]])
tmp = [[NSCalendarDate alloc] initWithTimeIntervalSinceReferenceDate: tmp = [[NSCalendarDate alloc] initWithTimeIntervalSinceReferenceDate:
[date timeIntervalSinceReferenceDate]]; [date timeIntervalSinceReferenceDate]];
else
[NSException raise: NSInvalidArgumentException
format: @"%@ invalid date given", NSStringFromSelector(_cmd)];
end = (NSCalendarDate*)[self laterDate: tmp]; end = (NSCalendarDate*)[self laterDate: tmp];
if (end == self) if (end == self)

1
Source/NSUserDefaults.m
View file

@ -219,6 +219,7 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
{ {
NSDictionary *regDefs; NSDictionary *regDefs;
[sharedDefaults synchronize]; // Ensure changes are written.
regDefs = RETAIN([sharedDefaults->_tempDomains regDefs = RETAIN([sharedDefaults->_tempDomains
objectForKey: NSRegistrationDomain]); objectForKey: NSRegistrationDomain]);
setSharedDefaults = NO; setSharedDefaults = NO;