bug fix for deleting a song when the last song or next to last song is playing…

bug fix for deleting a song when the last song or next to last song is playing and causing playlist.current to be set to -1 git-svn-id: https://svn.musicpd.org/mpd/trunk@1479 09075e82-0dd4-0310-85a5-a0d7c8717e4f

bug fix for deleting a song when the last song or next to last song is playing…
17c13ea0 · Warren Dukes · 77f824ce · 17c13ea0
Commit 17c13ea0 authored Jun 14, 2004 by Warren Dukes
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

playlist.c src/playlist.c +4 -4

No files found.
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -767,12 +767,12 @@ int deleteFromPlaylist(FILE * fp, int song) {
 		playlist_noGoToNext = 1;
 	}

-	if(playlist.current>=playlist.length) {
-		incrPlaylistCurrent();
-	}
-	else if(playlist.current>songOrder) {
+	if(playlist.current>songOrder) {
 		playlist.current--;
 	}
+	else if(playlist.current>=playlist.length) {
+		incrPlaylistCurrent();
+	}

 	if(playlist.queued>songOrder) {
 		playlist.queued--;