--- Common.pm	2005-09-29 01:20:00.000000000 -0700
+++ Slim/Buttons/Common.pm	2005-10-03 10:21:25.074809300 -0700
@@ -335,9 +335,19 @@ our %functions = (
 		
 		if ($client->power()) {
 			$brightmode = 'powerOnBrightness';
+			
 			if ($mode eq $client->prefGet('screensaver') ||
-					$mode eq $client->prefGet('idlesaver')) {
+					$mode eq $client->prefGet('idlesaver') || 
+						(($client->brightness() == $client->prefGet('idleBrightness') &&
+							$client->prefGet('autobrightness') &&
+							Slim::Hardware::IR::lastIRTime($client) &&
+							Slim::Hardware::IR::lastIRTime($client) < Time::HiRes::time() - $client->prefGet("screensavertimeout") && 
+							$mode ne 'block')
+						)
+					) {
+						
 				$brightmode = 'idleBrightness';
+			
 			}
 		} else {
 			$brightmode = 'powerOffBrightness';