From 061c08ba76f3fb54912dcb84b3c7d440755a87a2 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Mon, 18 Jan 2016 17:22:28 -0800
Subject: Fixed #621 Disable Play After behavior on Album Lists and only work
 on songs

---
 .../github/daneren2005/dsub/fragments/SelectDirectoryFragment.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'app/src/main/java/github')

diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
index 4209cfd6..316d30ad 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
@@ -387,10 +387,13 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Section
 		} else {
 			List<Entry> songs = new ArrayList<Entry>();
 
-			if(Util.getPreferences(context).getBoolean(Constants.PREFERENCES_KEY_PLAY_NOW_AFTER, true)) {
+			if(Util.getPreferences(context).getBoolean(Constants.PREFERENCES_KEY_PLAY_NOW_AFTER, true) && albumListType == null) {
 				Iterator it = entries.listIterator(entries.indexOf(entry));
 				while(it.hasNext()) {
-					songs.add((Entry) it.next());
+					Entry song = (Entry) it.next();
+					if(!song.isDirectory()) {
+						songs.add(song);
+					}
 				}
 			} else {
 				songs.add(entry);
-- 
cgit v1.2.3