From d51cc437552dcdc50dfa65a4bb7d2fd8d507a050 Mon Sep 17 00:00:00 2001 From: Wolfgang Lux Date: Sat, 23 Mar 2013 19:17:07 +0000 Subject: [PATCH] Check the result of the super class initializer and assign it to self. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/steptalk/trunk@36407 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Tools/STEnvironmentProcess.m | 34 +++++++++++++++++----------------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 423ea7a..963f50f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-03-23 Wolfgang Lux + + * Tools/STEnvironmentProcess.m (initWithDescriptionName:): + Check the result of the super class initializer and assign it to + self. + 2013-03-23 Wolfgang Lux * Frameworks/StepTalk/STActor.m (-init, -initWithEnvironment:, diff --git a/Tools/STEnvironmentProcess.m b/Tools/STEnvironmentProcess.m index 4bb7879..3bbfb77 100644 --- a/Tools/STEnvironmentProcess.m +++ b/Tools/STEnvironmentProcess.m @@ -7,25 +7,25 @@ @implementation STEnvironmentProcess - initWithDescriptionName:(NSString *)descName { - STEnvironmentDescription *desc; - - self = [super init]; - - if(descName) + if ((self = [super init]) != nil) { - NSLog(@"Creating environment from description '%@'", descName); - desc = [STEnvironmentDescription descriptionWithName:descName]; - environment = [[STEnvironment alloc] initWithDescription:desc]; - } - else - { - environment = [[STEnvironment alloc] initWithDefaultDescription]; - } - - /* FIXME: use some configurable mechanism */ - [environment setObject:environment forName:@"Environment"]; - [environment loadModule:@"SimpleTranscript"]; + STEnvironmentDescription *desc; + if (descName) + { + NSLog(@"Creating environment from description '%@'", descName); + desc = [STEnvironmentDescription descriptionWithName:descName]; + environment = [[STEnvironment alloc] initWithDescription:desc]; + } + else + { + environment = [[STEnvironment alloc] initWithDefaultDescription]; + } + + /* FIXME: use some configurable mechanism */ + [environment setObject:environment forName:@"Environment"]; + [environment loadModule:@"SimpleTranscript"]; + } return self; } - (void)dealloc