diff -upBr old/HTML/EN/cmdwrappers 6.5/HTML/EN/cmdwrappers
--- old/HTML/EN/cmdwrappers 2007-04-13 21:03:40.000000000 -0700
+++ 6.5/HTML/EN/cmdwrappers 2007-04-26 14:57:32.193790300 -0700
@@ -112,7 +112,7 @@ END %]
[%# this is an individual bread crumb %]
[% BLOCK crumblistitem -%]
-[%- IF item.title -%]
+[%- IF item.exists('title') -%]
[% item.title | html %]
[%- ELSE -%]
[% item | replace('^\s*/','') %]
diff -upBr old/Slim/Display/Graphics.pm 6.5/Slim/Display/Graphics.pm
--- old/Slim/Display/Graphics.pm 2007-03-27 20:31:58.000000000 -0700
+++ 6.5/Slim/Display/Graphics.pm 2007-04-26 16:01:03.949528600 -0700
@@ -250,7 +250,7 @@ sub render {
$sc->{scrollline} = undef;
}
- # if in sinle line mode and nothing on line[1], copy line[0] - don't do in ticker mode
+ # if in single line mode and nothing on line[1], copy line[0] - don't do in ticker mode
if (!($sfonts->{line}[0] || $dfonts->{line}[0]) && (!$screen->{line}[1] || $screen->{line}[1] eq '') &&
!exists($screen->{ticker})) {
$screen->{line}[1] = $screen->{line}[0];
diff -upBr old/Slim/Display/Lib/Fonts.pm 6.5/Slim/Display/Lib/Fonts.pm
--- old/Slim/Display/Lib/Fonts.pm 2007-03-27 20:31:58.000000000 -0700
+++ 6.5/Slim/Display/Lib/Fonts.pm 2007-04-26 16:02:25.842774100 -0700
@@ -218,7 +218,11 @@ sub loadExtent {
sub string {
my $defaultFontname = shift || return (0, '');
- my $string = shift || return (0, '');
+ my $string = shift;
+
+ if (!defined $string) {
+ return (0, '');
+ }
my $defaultFont = $fonts->{$defaultFontname} || do {
msg(" Invalid font $defaultFontname\n");
diff -upBr old/Slim/Music/Info.pm 6.5/Slim/Music/Info.pm
--- old/Slim/Music/Info.pm 2007-04-24 17:19:23.000000000 -0700
+++ 6.5/Slim/Music/Info.pm 2007-04-26 13:35:52.742545800 -0700
@@ -640,7 +640,7 @@ sub fileName {
$j = Slim::Utils::Misc::pathFromFileURL($j);
- if ($j && (splitdir($j))[-1]) {
+ if (defined $j && defined ((splitdir($j))[-1])) {
$j = (splitdir($j))[-1];
}
diff -upBr old/Slim/Utils/Misc.pm 6.5/Slim/Utils/Misc.pm
--- old/Slim/Utils/Misc.pm 2007-03-27 20:31:58.000000000 -0700
+++ 6.5/Slim/Utils/Misc.pm 2007-04-26 11:08:19.118330300 -0700
@@ -557,9 +557,13 @@ sub fixPathCase {
# there's not really a better way to do this..
sub fixPath {
- my $file = shift || return;
+ my $file = shift;
my $base = shift;
+ if (!defined($file)) {
+ return;
+ }
+
my $fixed;
if (Slim::Music::Info::isURL($file)) {