--- Slim/Buttons/ScreenSaver.pm.old	2004-11-25 13:56:32.953125000 -0800
+++ Slim/Buttons/ScreenSaver.pm	2004-11-25 12:13:27.312500000 -0800
@@ -101,7 +101,7 @@ sub screenSaver {
 			}
 			$client->update();
 		}
-	} elsif (!$client->power()) {
+	} elsif (!$client->power() && $mode ne Slim::Utils::Prefs::clientGet($client,'offsaver')) {
 		$saver = Slim::Utils::Prefs::clientGet($client,'offsaver');
 		if (Slim::Buttons::Common::validMode($saver)) {
 			Slim::Buttons::Common::pushMode($client, $saver) unless $mode eq $saver;
--- Slim/Player/Player.pm.old	2004-11-25 13:56:22.718750000 -0800
+++ Slim/Player/Player.pm	2004-11-25 13:55:30.812500000 -0800
@@ -248,7 +248,7 @@ sub power {
 	my $client = shift;
 	my $on = shift;
 
-	my $currOn = Slim::Utils::Prefs::clientGet($client,'power');
+	my $currOn = Slim::Utils::Prefs::clientGet($client,'power') || 0;
 	if (!defined $on) {
 		return ($currOn);
 	} else {