1 files changed, 7 insertions, 1 deletions
diff --git a/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
index ba8ea1e4..4c02a831 100644
--- a/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
@@ -282,16 +282,22 @@ public class DownloadServiceImpl extends Service implements DownloadService {
             }
             revision++;
         } else {
+			int size = size();
+			int index = getCurrentPlayingIndex();
             for (MusicDirectory.Entry song : songs) {
                 DownloadFile downloadFile = new DownloadFile(this, song, save);
                 downloadList.add(downloadFile);
             }
+			if(!autoplay && (size - 1) == index) {
+				setNextPlaying();
+			}
             revision++;
         }
         updateJukeboxPlaylist();
 		
-		if(shuffle)
+		if(shuffle) {
 			shuffle();
+		}
 
         if (autoplay) {
             play(0);