Index: Slim/Buttons/ScreenSaver.pm
===================================================================
--- Slim/Buttons/ScreenSaver.pm	(revision 2670)
+++ Slim/Buttons/ScreenSaver.pm	(working copy)
@@ -81,9 +81,7 @@
 		$client->brightness($dim);
 	}
 
-	if ($client->animating()) {
-		# if we're animating, let the animation play out
-	} elsif ($mode eq 'block') {
+	if ($mode eq 'block') {
 		# blocked mode handles its own updating of the screen.
 	} elsif ($timeout && 
 			$irtime < $now - $timeout && 
@@ -123,11 +121,11 @@
 			}
 			$client->update();
 		} else {
-			$client->scrollBottom();
+			$client->scrollBottom() unless $client->animating();
 		}
 	} else {
 		# try to scroll the bottom, if necessary
-		$client->scrollBottom();
+		$client->scrollBottom() unless $client->animating();
 	}
 	# Call ourselves again after 1 second
 	Slim::Utils::Timers::setTimer($client, ($now + 1.0), \&screenSaver);