[Slim-Checkins] r10366 - in /branches/6.5/server: Changelog6.html Slim/Player/Player.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Mon Oct 16 10:24:47 2006
New Revision: 10366

URL: http://svn.slimdevices.com?rev=10366&view=rev
Log:
Bug: 4382
Description: merge -r 10364:10365 from trunk

Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/Slim/Player/Player.pm

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10366&r1=10365&r2=10366&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Mon Oct 16 10:24:47 2006
@@ -94,6 +94,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4365">#4365</a> - ReplayGain.pm crash while using RadioTime</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4369">#4369</a> - songinfo download returns 404</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4376">#4376</a> - accessing log.txt causes a crash</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4382">#4382</a> - Now Playing Empty shows on both screens</li>
 	</ul>
 </ul>
 

Modified: branches/6.5/server/Slim/Player/Player.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Player/Player.pm?rev=10366&r1=10365&r2=10366&view=diff
==============================================================================
--- branches/6.5/server/Slim/Player/Player.pm (original)
+++ branches/6.5/server/Slim/Player/Player.pm Mon Oct 16 10:24:47 2006
@@ -530,8 +530,11 @@
 
 	if ($playlistlen < 1) {
 
-		$parts->{line}[0] = $client->string('NOW_PLAYING');
-		$parts->{line}[1] = $client->string('NOTHING');
+		$parts = { 'line' => [ $client->string('NOW_PLAYING'), $client->string('NOTHING') ] };
+
+		if ($client->display->showExtendedText() && !$suppressScreen2) {
+			$parts->{'screen2'} = {};
+		}
 
 	} else {