From ab687f2a8e4220f6638e87d6a6b6b98b5844a2cf Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Wed, 9 Sep 2015 08:56:47 -0700 Subject: Fix for crash on playAll --- .../github/daneren2005/dsub/fragments/SelectDirectoryFragment.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 cfbfa2af..93188e2f 100644 --- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java +++ b/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java @@ -113,6 +113,10 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Section super.onCreate(bundle); if(bundle != null) { entries = (List) bundle.getSerializable(Constants.FRAGMENT_LIST); + albums = (List) bundle.getSerializable(Constants.FRAGMENT_LIST2); + if(albums == null) { + albums = new ArrayList<>(); + } artistInfo = (ArtistInfo) bundle.getSerializable(Constants.FRAGMENT_EXTRA); restoredInstance = true; } @@ -803,7 +807,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Section } } private void playAll(final boolean shuffle, final boolean append) { - boolean hasSubFolders = !albums.isEmpty(); + boolean hasSubFolders = albums != null && !albums.isEmpty(); if (hasSubFolders && (id != null || share != null || "starred".equals(albumListType))) { downloadRecursively(id, false, append, !append, shuffle, false); -- cgit v1.2.3