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

[kdf at svn.slimdevices.com]

Author: kdf
Date: Wed Sep 27 22:40:39 2006
New Revision: 10078

URL: http://svn.slimdevices.com?rev=10078&view=rev
Log:
Bug: 4245
Description: merge -r10076:10077 from trunk


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

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10078&r1=10077&r2=10078&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Wed Sep 27 22:40:39 2006
@@ -27,6 +27,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4221">#4221</a> - 6.5 crashes on artist breadcrumb</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4228">#4228</a> - Fishbone skin status doesn't update from an empty playlist</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4237">#4237</a> - in Help > Internet Radio there is a dead link to Settings</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4245">#4245</a> - Pressing PLAY on top level browse pushes right</li>
 	<ul>
 </ul>
 

Modified: branches/6.5/server/Slim/Buttons/Home.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Buttons/Home.pm?rev=10078&r1=10077&r2=10078&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/Home.pm (original)
+++ branches/6.5/server/Slim/Buttons/Home.pm Wed Sep 27 22:40:39 2006
@@ -115,13 +115,14 @@
 		'play' => sub  {
 			my $client = shift;
 
-			if ($client->curSelection($client->curDepth()) eq 'NOW_PLAYING') {
+			my $selection = $client->curSelection($client->curDepth());
+			if ($selection eq 'NOW_PLAYING') {
 
 				$client->execute(['play']);
 
 				Slim::Buttons::Common::pushModeLeft($client, 'playlist');
 
-			} elsif ($client->curSelection($client->curDepth) =~ /^(?:BROWSE_|SAVED_PLAYLISTS)/) {
+			} elsif ($selection =~ /^(?:BROWSE_|SAVED_PLAYLISTS)/ && $selection !~ /^(?:BROWSE_MUSIC$)/) {
 
 				# If we're in a Browse mode and the user
 				# presses play, just go right, per Dean