Index: Slim/Control/Queries.pm =================================================================== --- Slim/Control/Queries.pm (revision 25535) +++ Slim/Control/Queries.pm (working copy) @@ -2400,7 +2400,7 @@ my ($valid, $start, $end) = $request->normalize(scalar($index), scalar($quantity), $totalCount); - if ($valid) { + if ($valid || $start == $end) { my $format = $prefs->get('titleFormat')->[ $prefs->get('titleFormatWeb') ]; @@ -2436,20 +2436,22 @@ $chunkCount++; } - my $lastChunk; - if ( $end == $totalCount - 1 && $chunkCount < $request->getParam('_quantity') ) { + if ( $end == $totalCount - 1 && $chunkCount < $request->getParam('_quantity') || $start == $end) { $lastChunk = 1; } - # add a favorites link below play/add links - #Add another to result count - my %favorites; - $favorites{'title'} = $playlistObj->name; - $favorites{'url'} = $playlistObj->url; + # add a favorites link below play/add links + #Add another to result count + my %favorites; + $favorites{'title'} = $playlistObj->name; + $favorites{'url'} = $playlistObj->url; ($chunkCount, $totalCount) = _jiveDeletePlaylist(start => $start, end => $end, lastChunk => $lastChunk, listCount => $totalCount, chunkCount => $chunkCount, request => $request, loopname => $loopname, playlistURL => $playlistObj->url, playlistID => $playlistID, playlistTitle => $playlistObj->name ); - ($chunkCount, $totalCount) = _jiveAddToFavorites(lastChunk => $lastChunk, start => $start, chunkCount => $chunkCount, listCount => $totalCount, request => $request, loopname => $loopname, favorites => \%favorites); + + if ($start != $end) { + ($chunkCount, $totalCount) = _jiveAddToFavorites(lastChunk => $lastChunk, start => $start, chunkCount => $chunkCount, listCount => $totalCount, request => $request, loopname => $loopname, favorites => \%favorites); + } } $request->addResult("count", $totalCount); @@ -4754,8 +4756,8 @@ my $playlistID = $args{'playlistID'}; return ($chunkCount, $listCount) unless $loopname && $playlistURL; - return ($chunkCount, $listCount) if $start == 0 && $end == 0; - + #return ($chunkCount, $listCount) if $start == 0 && $end == 0; + # We always bump listCount to indicate this request list will contain one more item at the end $listCount++;