Fixed song menu delete/download/cache running on everything if nothing was previously selected

1 files changed, 14 insertions, 2 deletions

diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
index 6af1b4ce..9561500f 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
@@ -426,11 +426,18 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
         checkLicenseAndTrialPeriod(onValid);
     }
 	private void downloadBackground(final boolean save) {
+		List<MusicDirectory.Entry> songs = getSelectedSongs();
+		if(songs.isEmpty()) {
+			selectAll(true, false);
+			songs = getSelectedSongs();
+		}
+		downloadBackground(save, songs);
+	}
+	private void downloadBackground(final boolean save, final List<MusicDirectory.Entry> songs) {
 		if (getDownloadService() == null) {
 			return;
 		}
 
-		final List<MusicDirectory.Entry> songs = getSelectedSongs();
 		Runnable onValid = new Runnable() {
 			@Override
 			public void run() {
@@ -446,8 +453,13 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
 	}
 
     private void delete() {
+		List<MusicDirectory.Entry> songs = getSelectedSongs();
+		if(songs.isEmpty()) {
+			selectAll(true, false);
+			songs = getSelectedSongs();
+		}
         if (getDownloadService() != null) {
-            getDownloadService().delete(getSelectedSongs());
+            getDownloadService().delete(songs);
         }
     }