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

[adrian at svn.slimdevices.com]

Author: adrian
Date: Wed Oct 11 14:37:53 2006
New Revision: 10298

URL: http://svn.slimdevices.com?rev=10298&view=rev
Log:
Bug: 4347
Description: merge -r 10294:10295 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=10298&r1=10297&r2=10298&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Wed Oct 11 14:37:53 2006
@@ -86,6 +86,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4318">#4318</a> - slimtray.exe: when slim.exe runs in userland a dos window comes up when external decoders are used</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4325">#4325</a> - Overlay does not correctly encode non latin characters</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4345">#4345</a> - Rss Ticker - screen always clearing between items</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4347">#4347</a> - Strange block mode display when mixing MIP</li>
 	</ul>
 </ul>
 

Modified: branches/6.5/server/Slim/Buttons/Block.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Buttons/Block.pm?rev=10298&r1=10297&r2=10298&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/Block.pm (original)
+++ branches/6.5/server/Slim/Buttons/Block.pm Wed Oct 11 14:37:53 2006
@@ -68,7 +68,7 @@
 
 	$client->lines(\&lines);
 
-	if (!$client->blocklines()->{'static'}) {
+	if ($client->blocklines() && !$client->blocklines()->{'static'}) {
 
 		$client->modeParam('modeUpdateInterval', $ticklength);
 	}
@@ -126,6 +126,8 @@
 
 	Slim::Buttons::ScreenSaver::wakeup($client);
 
+	$client->blocklines(undef);
+
 	if (Slim::Buttons::Common::mode($client) eq 'block') {
 		Slim::Buttons::Common::popMode($client);
 	}
@@ -136,7 +138,7 @@
 sub lines {
 	my $client = shift;
 
-	my $bdata = $client->blocklines();
+	my $bdata = $client->blocklines() || return {};
 	my $parts = $bdata->{'parts'};
 	my $screen1;