Index: Slim/Player/Playlist.pm
===================================================================
--- Slim/Player/Playlist.pm	(revision 5794)
+++ Slim/Player/Playlist.pm	(working copy)
@@ -109,6 +109,23 @@
 
 	if (defined($repeat)) {
 		$client->prefSet("repeat", $repeat);
+
+		# Check the buffers for the client and reset based on repeat change
+		foreach my $everyclient ($client, Slim::Player::Sync::syncedWith($client)) {
+			
+			if ($everyclient->playmode() =~ /playout/) {
+				
+				if ($repeat) {
+					
+					# changing to repeat all or one, set to continue playback
+					$everyclient->playmode('playout-play');
+				} else {
+					
+					# repeat off, set to stop at end of track
+					$everyclient->playmode('playout-stop');
+				}
+			}
+		}
 	}
 	
 	return $client->prefGet("repeat");