Index: Slim/Web/Setup.pm
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/Slim/Web/Setup.pm,v
retrieving revision 1.112
diff -u -p -B -r1.112 Setup.pm
--- Slim/Web/Setup.pm	25 Nov 2004 03:51:06 -0000	1.112
+++ Slim/Web/Setup.pm	26 Nov 2004 05:34:13 -0000
@@ -1124,7 +1124,7 @@ sub initSetupConfig {
 	,'server' => {
 		'children' => ['server','interface','behavior',
 		'itunes','formats',
-		'formatting','security','performance','network','debug']
+		'formatting','security','performance','network','debug',undef,undef]
 		,'title' => string('SERVER_SETTINGS')
 		,'singleChildLinkText' => string('ADDITIONAL_SERVER_SETTINGS')
 		,'preEval' => sub {
@@ -1137,7 +1137,7 @@ sub initSetupConfig {
 
 				if (Slim::Music::MoodLogic::canUseMoodLogic()) {
 					$pageref->{'GroupOrder'}[2] = 'moodlogic';
-					push @{$pageref->{'children'}}, 'moodlogic' if $pageref->{'children'}[-1] ne 'moodlogic';
+					push @{$pageref->{'children'}}, 'moodlogic' if ($pageref->{'children'}[-1] ne 'moodlogic' && $pageref->{'children'}[-2] ne 'moodlogic');
 				} else {
 					$pageref->{'GroupOrder'}[2] = undef;
 					pop @{$pageref->{'children'}} if $pageref->{'children'}[-1] eq 'moodlogic';
@@ -1145,7 +1145,7 @@ sub initSetupConfig {
 				
 				if (Slim::Music::MusicMagic::canUseMusicMagic()) {
 					$pageref->{'GroupOrder'}[3] = 'musicmagic';
-					push @{$pageref->{'children'}}, 'musicmagic' if $pageref->{'children'}[-1] ne 'musicmagic';
+					push @{$pageref->{'children'}}, 'musicmagic' if ($pageref->{'children'}[-1] ne 'musicmagic' && $pageref->{'children'}[-2] ne 'musicmagic');
 				} else {
 					$pageref->{'GroupOrder'}[3] = undef;
 					pop @{$pageref->{'children'}} if $pageref->{'children'}[-1] eq 'musicmagic';
@@ -2401,6 +2401,7 @@ sub buildLinkList {
 	my $pagenum = 0;
 	my %linkinfo;
 	foreach my $page (@pages) {
+		next if !defined $page;
 		%linkinfo = ();
 		#usePrefix is true for all but first item
 		$linkinfo{'usePrefix'} = $pagenum;