[Slim-Checkins] r9675 - in /branches/6.5/server: Changelog6.html Slim/Buttons/ScreenSaver.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Wed Sep 13 15:34:13 2006
New Revision: 9675

URL: http://svn.slimdevices.com?rev=9675&view=rev
Log:
Bug: 4090
Description: merge from trunk -r 9670:9671

Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/Slim/Buttons/ScreenSaver.pm

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=9675&r1=9674&r2=9675&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Wed Sep 13 15:34:13 2006
@@ -608,10 +608,11 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4063">#4063</a> - Manual search play controls for album results don't work</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4064">#4064</a> - Broken ogg file causes playlist to get one behind</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4070">#4070</a> - File cache world writable</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4076">#4076</a> - DBD::mysql::st execute failed: Unknown column 'me.name'</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4078">#4078</a> - Random mix does not always work with sync</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4080">#4080</a> - Transporter digital inputs should be treated like a song</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4090">#4090</a> - now playing screensaver doesn't kick in if you are on another song in the current playlist</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4094">#4094</a> - Display 'bits' go blank briefly when screen text begins to scroll after a push</li>
-		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4096">#4096</a> - DBD::mysql::st execute failed: Unknown column 'me.name'</li>
 	</ul>
 </ul>
 

Modified: branches/6.5/server/Slim/Buttons/ScreenSaver.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Buttons/ScreenSaver.pm?rev=9675&r1=9674&r2=9675&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/ScreenSaver.pm (original)
+++ branches/6.5/server/Slim/Buttons/ScreenSaver.pm Wed Sep 13 15:34:13 2006
@@ -102,7 +102,9 @@
 		# don't change modes when none (just dim) is the screensaver.
 	} elsif ($timeout && 
 			$irtime < $now - $timeout && 
-			$mode ne $saver &&
+			( ($mode ne $saver) || 
+			 # in case the saver is 'now playing' and we're browsing another song
+			 ($mode eq 'playlist' && !Slim::Buttons::Playlist::showingNowPlaying($client)) ) &&
 			$mode ne 'screensaver' && # just in case it falls into default, we dont want recursive pushModes
 			$mode ne 'block' &&
 			$client->power()) {