[Slim-Checkins] r9358 - in /trunk/server/Slim/Player: Source.pm Squeezebox2.pm

[andy at svn.slimdevices.com]

Author: andy
Date: Fri Sep  1 18:04:17 2006
New Revision: 9358

URL: http://svn.slimdevices.com?rev=9358&view=rev
Log:
Bug 4038, Don't crash if there is no client for chunks.  Use stop method instead of execute when upgading firmware

Modified:
    trunk/server/Slim/Player/Source.pm
    trunk/server/Slim/Player/Squeezebox2.pm

Modified: trunk/server/Slim/Player/Source.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Source.pm?rev=9358&r1=9357&r2=9358&view=diff
==============================================================================
--- trunk/server/Slim/Player/Source.pm (original)
+++ trunk/server/Slim/Player/Source.pm Fri Sep  1 18:04:17 2006
@@ -645,6 +645,8 @@
 	my $chunk;
 	my $len;
 
+	return if !$client;
+
 	# if there's a chunk in the queue, then use it.
 	if (ref($client->chunks) eq 'ARRAY' && scalar(@{$client->chunks})) {
 

Modified: trunk/server/Slim/Player/Squeezebox2.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Squeezebox2.pm?rev=9358&r1=9357&r2=9358&view=diff
==============================================================================
--- trunk/server/Slim/Player/Squeezebox2.pm (original)
+++ trunk/server/Slim/Player/Squeezebox2.pm Fri Sep  1 18:04:17 2006
@@ -201,7 +201,7 @@
 		return(0);
 	}
 	
-	$client->execute(["stop"]);
+	$client->stop();
 
 	$::d_firmware && msg("using new update mechanism: $filename\n");