[Slim-Checkins] r33624 - /7.7/trunk/server/Slim/Control/Jive.pm

Author: mherger
Date: Wed Oct 26 06:02:52 2011
New Revision: 33624

URL: http://svn.slimdevices.com/slim?rev=33624&view=rev
Log:
Bug: n/a
Description: Jive is assuming every string consisting of all uppercase characters to be a string token. That's wrong for eg. BBC and leads to ugly backtraces filling the log file. Check for the existence of a string before getting it.

Modified:
    7.7/trunk/server/Slim/Control/Jive.pm

Modified: 7.7/trunk/server/Slim/Control/Jive.pm
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Slim/Control/Jive.pm?rev=33624&r1=33623&r2=33624&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/Control/Jive.pm (original)
+++ 7.7/trunk/server/Slim/Control/Jive.pm Wed Oct 26 06:02:52 2011
@@ -3034,14 +3034,14 @@
 	my $clone = Storable::dclone($item);
 	
 	if ( $clone->{stringToken} ) {
-		if ( $clone->{stringToken} eq uc( $clone->{stringToken} ) ) {
+		if ( $clone->{stringToken} eq uc( $clone->{stringToken} ) && Slim::Utils::Strings::stringExists( $clone->{stringToken} ) ) {
 			$clone->{text} = $client->string( delete $clone->{stringToken} );
 		}
 		else {
 			$clone->{text} = delete $clone->{stringToken};
 		}
 	}
-	elsif ( $clone->{text} && $clone->{text} eq uc( $clone->{text} ) ) {
+	elsif ( $clone->{text} && $clone->{text} eq uc( $clone->{text} ) && Slim::Utils::Strings::stringExists( $clone->{text} ) ) {
 		$clone->{text} = $client->string( $clone->{text} );
 	}