Merge branch 'public/7.8' into public/7.9

LMS-Community · Apr 13, 2016 · 8bb187f · 8bb187f
2 parents 6353540 + 312750f
commit 8bb187f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Slim/Networking/SqueezeNetwork/PrefSync.pm b/Slim/Networking/SqueezeNetwork/PrefSync.pm
@@ -224,6 +224,10 @@ sub _syncDown_done {
 	# Client prefs
 	if ( $client ) {
 		my $cprefs = $prefs->client($client);
+
+		if ( ($content->{next_sync} || 0) < 60 ) {
+			$content->{next_sync} = 300;
+		}
 
 		$cprefs->set( snLastSyncDown => $content->{timestamp} );
 		$cprefs->set( snSyncInterval => $content->{next_sync} );
@@ -369,7 +373,7 @@ sub prefEvent {
 	my $request = shift;
 	my $client  = $request->client;
 
-	if ( $client && !$client->isa('Slim::Player::Squeezebox2') ) {
+	if ( !defined $client || !$client->isa('Slim::Player::Squeezebox2') || $client->deviceid =~ /^(?:3|6|8|11|12)/ ) {
 		return;
 	}