===================================================================
RCS file: /cvs/mp3/daemon/playmp3s.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mp3/daemon/playmp3s.pl	2007/02/08 23:02:30	1.6
+++ mp3/daemon/playmp3s.pl	2010/10/28 20:21:29	1.7
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $RedRiver: playmp3s.pl,v 1.5 2007/02/08 18:13:33 andrew Exp $
+# $RedRiver: playmp3s.pl,v 1.6 2007/02/08 23:02:30 andrew Exp $
 ########################################################################
 # PlayMP3.pl *** play's MP3s off a playlist using mp3play
 #
@@ -67,6 +67,10 @@
 		DisplayPlaying($cfgs{currenthtml},$filename);
 		Print_PlayLog("done\n");
 
+		Print_PlayLog("Adding Last. . .");
+		AddLast($filename, $cfgs{playedlist}, $Num_History, $cfgs{playedhtml}, $cfgs{addurl});
+		Print_PlayLog("done\n");
+
 		if ($save_playlist) {
 			Print_PlayLog("Saving Playlist. . .");
 			save_playlist($cfgs{list},@playlist) || bail("Unable to save playlist!: $!");
@@ -90,7 +94,6 @@
 		Print_PlayLog("$player\n");
 		`$player`;
 
-
 #	my $kid = 0;
 #    while ($kid ne -1 && ContinueRun()) { 
 #     while ($kid ne -1) { 
@@ -100,14 +103,6 @@
 #    }
 
 
-		if ($song) {
-			Print_PlayLog("Adding Last. . .");
-			delete ${ $Full_Playlist{list} }{$song};
-
-			AddLast($filename, $cfgs{playedlist}, $Num_History, $cfgs{playedhtml}, $cfgs{addurl});
-			Print_PlayLog("done\n");
-		}
-		
 		Print_PlayLog("Displaying Nothing . . .");
 		DisplayPlaying($cfgs{currenthtml},"Nothing");
 		Print_PlayLog("done\n");
@@ -171,7 +166,6 @@
 		my %played;
 		@played{@played_list} = ();
 
-	
 		delete $Full_Playlist{list};
 
 		my $list_size = 0;
@@ -273,10 +267,15 @@
 	my $addurl   = shift;
 	
 	my @LIST = get_playlist($lastlist);
+	
+	DisplayPrevious($htmlfile, $addurl, @LIST) if $htmlfile;
+
 	unshift @LIST, $lastsong;
 	splice (@LIST, $history) if $history;
 	save_playlist($lastlist,@LIST);
-	DisplayPrevious($htmlfile, $addurl, @LIST);
+
+	# Remove song from full list so we don't play it again.
+	delete $Full_Playlist{list}{$lastsong};
 }