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

[adrian at svn.slimdevices.com]

Author: adrian
Date: Sun Sep 24 03:58:38 2006
New Revision: 10011

URL: http://svn.slimdevices.com?rev=10011&view=rev
Log:
Bug: 4190
Description: merge -r 10009:10010 from trunk

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

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10011&r1=10010&r2=10011&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Sun Sep 24 03:58:38 2006
@@ -12,6 +12,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4171">#4171</a> - Default2 redirect to Default.</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4173">#4173</a> - press right to add to favorites option disappears once you've used it, until you restart server</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4173">#4178</a> - Live365 stations don't have a note symbol</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4190">#4190</a> - xmlbrower transition problem</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4191">#4191</a> - Live365 Search has missing strings</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4192">#4192</a> - IE doesn't refresh status</li>
 	<ul>

Modified: branches/6.5/server/Slim/Buttons/Block.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Buttons/Block.pm?rev=10011&r1=10010&r2=10011&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/Block.pm (original)
+++ branches/6.5/server/Slim/Buttons/Block.pm Sun Sep 24 03:58:38 2006
@@ -79,7 +79,8 @@
 
 	# restore previous lines and display screen
 	$client->lines( $client->modeParam('oldLines') );
-	$client->update();
+
+	$client->update() if $client->modeParam('block.updatedscreen');
 }
 
 =head2 block( $client, $line1 )
@@ -109,11 +110,6 @@
 	Slim::Buttons::Common::pushMode($client, 'block');
 
 	$client->modeParam('block.name', $blockName);
-
-	if (ref($parts) eq 'HASH') {
-
-		$client->showBriefly($parts);
-	}
 }
 
 =head2 unblock( $client )
@@ -141,6 +137,8 @@
 	my $parts = $bdata->{'parts'};
 	my $screen1;
 
+	$client->modeParam('block.updatedscreen', 1);
+	
 	if ($bdata->{'static'}) {
 
 		return $parts