1 files changed, 8 insertions, 1 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/EntryInfiniteGridAdapter.java b/app/src/main/java/github/daneren2005/dsub/adapter/EntryInfiniteGridAdapter.java
index 2c4f75dc..6c1c14da 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/EntryInfiniteGridAdapter.java
+++ b/app/src/main/java/github/daneren2005/dsub/adapter/EntryInfiniteGridAdapter.java
@@ -26,6 +26,7 @@ import github.daneren2005.dsub.R;
 import github.daneren2005.dsub.domain.MusicDirectory;
 import github.daneren2005.dsub.domain.MusicDirectory.Entry;
 import github.daneren2005.dsub.domain.ServerInfo;
+import github.daneren2005.dsub.fragments.MainFragment;
 import github.daneren2005.dsub.service.MusicService;
 import github.daneren2005.dsub.service.MusicServiceFactory;
 import github.daneren2005.dsub.util.ImageLoader;
@@ -88,6 +89,10 @@ public class EntryInfiniteGridAdapter extends EntryGridAdapter {
 		this.type = type;
 		this.extra = extra;
 		this.size = size;
+
+		if(super.getItemCount() < size) {
+			allLoaded = true;
+		}
 	}
 
 	public void loadMore() {
@@ -110,7 +115,7 @@ public class EntryInfiniteGridAdapter extends EntryGridAdapter {
 				appendCachedData(newData);
 				loading = false;
 
-				if(newData.isEmpty()) {
+				if(newData.size() < size) {
 					allLoaded = true;
 					notifyDataSetChanged();
 				}
@@ -126,6 +131,8 @@ public class EntryInfiniteGridAdapter extends EntryGridAdapter {
 			result = service.getAlbumList(type, extra, size, offset, false, context, null);
 		} else if("genres".equals(type) || "genres-songs".equals(type)) {
 			result = service.getSongsByGenre(extra, size, offset, context, null);
+		}else if(type.indexOf(MainFragment.SONGS_LIST_PREFIX) != -1) {
+			result = service.getSongList(type, size, offset, context, null);
 		} else {
 			result = service.getAlbumList(type, size, offset, false, context, null);
 		}