--- ../Visualizer.pm	2005-08-31 19:17:00.000000000 -0700
+++ Plugins/Visualizer.pm	2005-09-01 13:50:27.515625000 -0700
@@ -273,7 +267,7 @@ sub setVisualizerMode() {
 	$client->lines(\&screensaverLines);
 
 	# do it again at the next period
-	if ($screensaver_info{$mode}->{showtext}) {
+	if ($screensaver_info{$mode}->{showtext} && $client->prefGet('screensavershowtext')) {
 		Slim::Control::Command::setExecuteCallback(\&_showsongtransition);
 		Slim::Utils::Timers::setTimer($client, Time::HiRes::time() + $initialtextofftime,
 									  \&_pushon,
--- ../strings.txt	2005-09-01 01:00:00.000000000 -0700
+++ strings.txt	2005-09-01 13:34:02.500000000 -0700
@@ -4007,6 +4007,12 @@ SETUP_SCREENSAVERTIMEOUT
 	EN	Screensaver Timeout:
 	ES	Tiempo de espera para Salvapantalla:
 
+SETUP_SCREENSAVERSHOWTEXT_CHOOSE
+	EN	Show Now Playing Text:
+
+SETUP_SCREENSAVERSHOWTEXT
+	EN	Show Now Playing Text (if applicable):
+
 SCREENSAVER_JUMP_BACK_NAME
 	CZ	Nyní hraje (Skočí zpátky při probuzení.)
 	DE	Es läuft gerade... (beim Aufwachen zurückspringen)
--- Setup.pm	2005-08-31 19:27:00.000000000 -0700
+++ Slim/Web/Setup.pm	2005-09-01 13:32:30.390625000 -0700
@@ -182,7 +182,7 @@ sub initSetupConfig {
 					,'GroupLine' => 1
 				}
 			,'ScreenSaver' => {
-				'PrefOrder' => ['screensaver','idlesaver','offsaver','screensavertimeout']
+				'PrefOrder' => ['screensaver','idlesaver','offsaver','screensavertimeout','screensavershowtext']
 				,'Suppress_PrefHead' => 1
 				,'Suppress_PrefDesc' => 1
 				,'Suppress_PrefLine' => 1
@@ -259,6 +259,13 @@ sub initSetupConfig {
 							'validate' => \&validateNumber
 							,'validateArgs' => [0,undef,1]
 						}
+			,'screensavershowtext' => {
+						'validate' => \&validateTrueFalse
+						,'options' => {
+								'0' => string('NO')
+								,'1' => string('YES')
+								}
+						}
 			}
 		} #end of setup{'player'} hash