From b5d889c5e15daac4f348deffe6a84e3b24f60b10 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Fri, 26 Jun 2015 12:54:51 +0200
Subject: [PATCH] Fixed FC when selecting shuffle playlist from the menu for
 smart playlists

---
 .../adapter/songadapter/AbsPlaylistSongAdapter.java           | 4 ++++
 .../gramophone/ui/activities/PlaylistDetailActivity.java      | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AbsPlaylistSongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AbsPlaylistSongAdapter.java
index 3dcab79f..e1c6834d 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AbsPlaylistSongAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/songadapter/AbsPlaylistSongAdapter.java
@@ -45,6 +45,10 @@ public abstract class AbsPlaylistSongAdapter<S extends Song> extends AbsMultiSel
         notifyDataSetChanged();
     }
 
+    public ArrayList<S> getDataSet(){
+        return dataSet;
+    }
+
     protected int getMultiSelectMenuRes() {
         return R.menu.menu_playlists_songs_selection;
     }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
index 6e954c23..d0e01932 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
@@ -22,7 +22,6 @@ import com.kabouzeid.gramophone.misc.DragSortRecycler;
 import com.kabouzeid.gramophone.model.DataBaseChangedEvent;
 import com.kabouzeid.gramophone.model.Playlist;
 import com.kabouzeid.gramophone.model.PlaylistSong;
-import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.model.smartplaylist.SmartPlaylist;
 import com.kabouzeid.gramophone.ui.activities.base.AbsFabActivity;
 import com.kabouzeid.gramophone.util.NavigationUtil;
@@ -136,7 +135,8 @@ public class PlaylistDetailActivity extends AbsFabActivity implements CabHolder
         int id = item.getItemId();
         switch (id) {
             case R.id.action_shuffle_playlist:
-                MusicPlayerRemote.openAndShuffleQueue(this, new ArrayList<Song>(songs), true);
+                //noinspection unchecked
+                MusicPlayerRemote.openAndShuffleQueue(this, adapter.getDataSet(), true);
                 return true;
             case R.id.action_equalizer:
                 NavigationUtil.openEqualizer(this);