--- Slim/Control/Command.pm.old	2004-10-05 11:40:42.875000000 -0700
+++ Slim/Control/Command.pm	2004-10-06 09:23:39.140625000 -0700
@@ -790,7 +790,7 @@ sub executeCallback {
 sub load_done {
 	my ($client, $index, $callbackf, $callbackargs)=@_;
 	# dont' keep current song on loading a playlist
-	Slim::Player::Playlist::reshuffle($client,1);
+	Slim::Player::Playlist::reshuffle($client,($client->playmode eq "play" || ($client->power && $client->playmode eq "pause"))?0:1);
 	if (defined($index)) {
 		Slim::Player::Source::jumpto($client, $index);
 	}