mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 00:11:26 +00:00
Ensure defaults are synchronized before a reset.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@14348 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
b44d9a64b6
commit
4892d558c5
2 changed files with 5 additions and 1 deletions
|
@ -1689,9 +1689,12 @@ static inline int getDigits(const char *from, char *to, int limit)
|
|||
*/
|
||||
if ([date isKindOfClass: [NSCalendarDate class]])
|
||||
tmp = (NSCalendarDate*)RETAIN(date);
|
||||
else
|
||||
else if ([date isKindOfClass: [NSDate class]])
|
||||
tmp = [[NSCalendarDate alloc] initWithTimeIntervalSinceReferenceDate:
|
||||
[date timeIntervalSinceReferenceDate]];
|
||||
else
|
||||
[NSException raise: NSInvalidArgumentException
|
||||
format: @"%@ invalid date given", NSStringFromSelector(_cmd)];
|
||||
|
||||
end = (NSCalendarDate*)[self laterDate: tmp];
|
||||
if (end == self)
|
||||
|
|
|
@ -219,6 +219,7 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
|
|||
{
|
||||
NSDictionary *regDefs;
|
||||
|
||||
[sharedDefaults synchronize]; // Ensure changes are written.
|
||||
regDefs = RETAIN([sharedDefaults->_tempDomains
|
||||
objectForKey: NSRegistrationDomain]);
|
||||
setSharedDefaults = NO;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue