--- Slim/Web/Setup.pm.old	2005-03-29 10:07:03.296875000 -0800
+++ Slim/Web/Setup.pm	2005-03-29 10:07:13.140625000 -0800
@@ -124,18 +124,17 @@ sub initSetupConfig {
 							$pageref->{'Prefs'}{'idlesaver'}{'options'} = Slim::Buttons::Common::hash_of_savers();
 							$pageref->{'Prefs'}{'offsaver'}{'options'} = Slim::Buttons::Common::hash_of_savers();
 						}
+						if (Slim::Utils::Prefs::clientGet($client,'showbufferfullness')) {
+							$pageref->{'Prefs'}{'playingDisplayMode'}{'options'}{'6'} =  string('SETUP_SHOWBUFFERFULLNESS');
+							$pageref->{'Prefs'}{'playingDisplayMode'}{'validateArgs'} = [0,6,1,1];
+						} else {
+							delete $pageref->{'Prefs'}{'playingDisplayMode'}{'options'}{'6'};
+							$pageref->{'Prefs'}{'playingDisplayMode'}{'validateArgs'} = [0,5,1,1];
+						}
 					} else {
 						$pageref->{'GroupOrder'} = ['Default','TitleFormats'];
 					}
 					
-					if (Slim::Utils::Prefs::clientGet($client,'showbufferfullness')) {
-					 	$pageref->{'Prefs'}{'playingDisplayMode'}{'options'}{'6'} =  string('SETUP_SHOWBUFFERFULLNESS');
-					 	$pageref->{'Prefs'}{'playingDisplayMode'}{'validateArgs'} = [0,6,1,1];
-					} else {
-						delete $pageref->{'Prefs'}{'playingDisplayMode'}{'options'}{'6'};
-					 	$pageref->{'Prefs'}{'playingDisplayMode'}{'validateArgs'} = [0,5,1,1];
-					}
-
 					$pageref->{'Prefs'}{'playername'}{'validateArgs'} = [$client->defaultName()];
 
 				}
@@ -150,12 +149,15 @@ sub initSetupConfig {
 					if (defined($client->revision)) {
 						$paramref->{'versionInfo'} = string("PLAYER_VERSION") . string("COLON") . $client->revision;
 					}
+					
 					$paramref->{'ipaddress'} = $client->ipport();
 					$paramref->{'macaddress'} = $client->macaddress;
 					$paramref->{'signalstrength'} = $client->signalStrength;
 
-					$pageref->{'Prefs'}{'playingDisplayMode'}{'options'} = $client->playingModeOptions();
-					$pageref->{'Prefs'}{'playingDisplayMode'}{'validateArgs'} = [0,scalar($pageref->{'Prefs'}{'playingDisplayMode'}{'options'}),1,1];
+					if ($client->isPlayer()) {
+						$pageref->{'Prefs'}{'playingDisplayMode'}{'options'} = $client->playingModeOptions();
+						$pageref->{'Prefs'}{'playingDisplayMode'}{'validateArgs'} = [0,scalar($pageref->{'Prefs'}{'playingDisplayMode'}{'options'}),1,1];
+					}
 
 					$client->update();
 				}
--- Slim/Player/Client.pm.old	2005-03-29 10:08:27.515625000 -0800
+++ Slim/Player/Client.pm	2005-03-29 10:03:24.531250000 -0800
@@ -1095,6 +1095,7 @@ sub bumpUp {}
 sub bumpDown {}
 sub scrollBottom {}
 sub parseLines {}
+sub playingModeOptions {}
 
 sub pause {
 	my $client = shift;