Fix timing issue when starting in shuffle mode as playlist is being restored

1 files changed, 16 insertions, 6 deletions

diff --git a/src/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java b/src/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java
index 40bb5871..e2941fc9 100644
--- a/src/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java
+++ b/src/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java
@@ -157,15 +157,25 @@ public class DownloadServiceLifecycleSupport {
 		new CacheCleaner(downloadService, downloadService).clean();
 	}
 
-	public void onStart(Intent intent) {
+	public void onStart(final Intent intent) {
 		if (intent != null) {
 			String action = intent.getAction();
 			if(DownloadService.START_PLAY.equals(action)) {
-				if(intent.getBooleanExtra(Constants.INTENT_EXTRA_NAME_SHUFFLE, false)) {
-					downloadService.setShufflePlayEnabled(true);
-				} else {
-					downloadService.start();
-				}
+				eventHandler.post(new Runnable() {
+					@Override
+					public void run() {
+						if(!setup.get()) {
+							lock.lock();
+							lock.unlock();
+						}
+
+						if(intent.getBooleanExtra(Constants.INTENT_EXTRA_NAME_SHUFFLE, false)) {
+							downloadService.setShufflePlayEnabled(true);
+						} else {
+							downloadService.start();
+						}
+					}
+				});
 			} else if(DownloadService.CANCEL_DOWNLOADS.equals(action)) {
 				downloadService.clearBackground();
 			} else if(intent.getExtras() != null) {