Fixed slight all-flashers-are-red bug in r2051.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2052 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2009-02-11 17:52:38 +00:00
parent 557a353cc4
commit 2ff91cb503

View File

@ -1174,10 +1174,10 @@ static NSString * const kDefaultDemoShip = @"coriolis-station";
BOOL initiallyOn; BOOL initiallyOn;
// "Validate" is really "clean up", since all values have defaults. // "Validate" is really "clean up", since all values have defaults.
colors = [result arrayForKey:@"colors"]; colors = [declaration arrayForKey:@"colors"];
if (colors == nil) if ([colors count] == 0)
{ {
colorDesc = [result objectForKey:@"color"]; colorDesc = [declaration objectForKey:@"color"];
if (colorDesc == nil) colorDesc = @"redColor"; if (colorDesc == nil) colorDesc = @"redColor";
colors = [NSArray arrayWithObject:colorDesc]; colors = [NSArray arrayWithObject:colorDesc];
} }