[Slim-Checkins] r9367 - in /branches/6.5/server: Changelog6.html Plugins/Health/HTML/EN/plugins/Health/index.html Plugins/Health/Plugin.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Sat Sep  2 03:18:27 2006
New Revision: 9367

URL: http://svn.slimdevices.com?rev=9367&view=rev
Log:
Bug: 4031
Description: merge -r 9364:9366 from trunk

Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/Plugins/Health/HTML/EN/plugins/Health/index.html
    branches/6.5/server/Plugins/Health/Plugin.pm

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=9367&r1=9366&r2=9367&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Sat Sep  2 03:18:27 2006
@@ -543,6 +543,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4015">#4015</a> - Web setup corrupts screensaver settings in player UI</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4021">#4021</a> - build-perl-modules hangs on YAML-Syck-0.64</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4025">#4025</a> - Apple Lossless Files not playing</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4031">#4031</a> - Crash when enabling Network Health with no players</li>
 	</ul>
 </ul>
 

Modified: branches/6.5/server/Plugins/Health/HTML/EN/plugins/Health/index.html
URL: http://svn.slimdevices.com/branches/6.5/server/Plugins/Health/HTML/EN/plugins/Health/index.html?rev=9367&r1=9366&r2=9367&view=diff
==============================================================================
--- branches/6.5/server/Plugins/Health/HTML/EN/plugins/Health/index.html (original)
+++ branches/6.5/server/Plugins/Health/HTML/EN/plugins/Health/index.html Sat Sep  2 03:18:27 2006
@@ -88,7 +88,9 @@
 	[% END %]
 
 	<h4>[% "PLUGIN_HEALTH_PERF_STATISTICS" | string %]</h4>
-	<p><a href="[% webroot %]plugins/Health/player.html?player=[% player | uri	%]">[% "PLUGIN_HEALTH_PLAYER" | string %] : [% playername %]</a></p>
+	[% IF player %]
+		<p><a href="[% webroot %]plugins/Health/player.html?player=[% player | uri	%]">[% "PLUGIN_HEALTH_PLAYER" | string %] : [% playername %]</a></p>
+	[% END %]
 	<p><a href="[% webroot %]plugins/Health/server.html?player=[% player | uri %]">[% "PLUGIN_HEALTH_SERVER" | string %]</a></p>
 	<p><a href="[% webroot %]plugins/Health/index.html?perf=off">[% "PLUGIN_HEALTH_PERF_DISABLE" | string %]</a></p>
     <p></p>

Modified: branches/6.5/server/Plugins/Health/Plugin.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Plugins/Health/Plugin.pm?rev=9367&r1=9366&r2=9367&view=diff
==============================================================================
--- branches/6.5/server/Plugins/Health/Plugin.pm (original)
+++ branches/6.5/server/Plugins/Health/Plugin.pm Sat Sep  2 03:18:27 2006
@@ -274,7 +274,7 @@
 
 	foreach my $mon (@perfmonLogs) {
 
-		next if ($type ne $mon->{'type'});
+		next if ($type ne $mon->{'type'} || $type eq 'player' && !$client);
 
 		my $monitor = ($type eq 'server') ? ${$mon->{'monitor'}} : $mon->{'monitor'}($client);
 
@@ -298,7 +298,7 @@
 		};
 	}
 
-	$params->{'playername'} = $client->name();
+	$params->{'playername'} = $client->name() if $client;
 	$params->{'type'} = $type;
 	$params->{'graphs'} = \@graphs;