[Slim-Checkins] r12301 - in /branches/6.5/server: Changelog6.html Slim/Control/Commands.pm

[kdf at svn.slimdevices.com]

Author: kdf
Date: Sun Jun 24 20:30:54 2007
New Revision: 12301

URL: http://svn.slimdevices.com?rev=12301&view=rev
Log:
Bug: 5104 (also at least a temporary for Bug 5100 and 4571)
Description: merge -r 12299:12300 from trunk


Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/Slim/Control/Commands.pm

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=12301&r1=12300&r2=12301&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Sun Jun 24 20:30:54 2007
@@ -49,6 +49,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=5094">#5094</a> - Pausing track after transcoding has finished causes rebuffering message</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=5095">#5095</a> - Comment search broken</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=5103">#5103</a> - Very short tracks: Player streams too many files to the player</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=5104">#5104</a> - "Now Playing - (SqueezeBox IP)" is on the playlist.</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=5121">#5121</a> - Accented characters in Genre broken in Random Mix Web Interface</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=5123">#5123</a> - Switch to Squeezenetwork link missing in some skins</li>
 	</ul>

Modified: branches/6.5/server/Slim/Control/Commands.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Control/Commands.pm?rev=12301&r1=12300&r2=12301&view=diff
==============================================================================
--- branches/6.5/server/Slim/Control/Commands.pm (original)
+++ branches/6.5/server/Slim/Control/Commands.pm Sun Jun 24 20:30:54 2007
@@ -2234,6 +2234,10 @@
 
 	} else {
 
+		# on search, only grab audio items.
+		$find{'audio'} = 1;
+		$find{'remote'} = 0;
+
 		# Bug 2271 - allow VA albums.
 		if (defined $find{'album.compilation'} && $find{'album.compilation'} == 1) {