gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 06:00:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Retain the shared user defaults controller before returning it in

Browse source 
initWithCoder:.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28368 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2009-06-21 22:35:23 +00:00
parent 8ed4d5e90e
commit 988c2a8a8b
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-06-22 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSUserDefaultsController.m (-initWithCoder:): Retain the
shared controller before returning it.
2009-06-22 Fred Kiefer <FredKiefer@gmx.de> 2009-06-22 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSKeyValueBinding.m (GSKeyValueBinding+initialize): * Source/NSKeyValueBinding.m (GSKeyValueBinding+initialize):

10
Source/NSUserDefaultsController.m
View file

@ -200,6 +200,12 @@ static id shared = nil;
- (void) dealloc - (void) dealloc
{ {
if (self == shared)
{
// Should never get here
shared = nil;
}
[[NSNotificationCenter defaultCenter] removeObserver: self]; [[NSNotificationCenter defaultCenter] removeObserver: self];
RELEASE(_values); RELEASE(_values);
RELEASE(_defaults); RELEASE(_defaults);
@ -296,7 +302,7 @@ static id shared = nil;
- (void) encodeWithCoder: (NSCoder *)aCoder - (void) encodeWithCoder: (NSCoder *)aCoder
{ {
if ([aCoder allowsKeyedCoding]) if ([aCoder allowsKeyedCoding])
if (self == [NSUserDefaultsController sharedUserDefaultsController]) if (self == shared)
{ {
[aCoder encodeBool: YES forKey: @"NSSharedInstance"]; [aCoder encodeBool: YES forKey: @"NSSharedInstance"];
return; return;
@ -311,7 +317,7 @@ static id shared = nil;
if ([aDecoder decodeBoolForKey: @"NSSharedInstance"]) if ([aDecoder decodeBoolForKey: @"NSSharedInstance"])
{ {
RELEASE(self); RELEASE(self);
return [NSUserDefaultsController sharedUserDefaultsController]; return RETAIN([NSUserDefaultsController sharedUserDefaultsController]);
} }
return [super initWithCoder: aDecoder]; return [super initWithCoder: aDecoder];