From abce4d32b688db4aeb2657da71403eaeeaf0186b Mon Sep 17 00:00:00 2001 From: daneren2005 Date: Tue, 3 Dec 2013 13:23:29 -0800 Subject: #203 Only pass onto now playing if service is active --- .../dsub/activity/SubsonicFragmentActivity.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java b/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java index 66d4d4ee..ae8c02a6 100644 --- a/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java +++ b/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java @@ -83,13 +83,16 @@ public class SubsonicFragmentActivity extends SubsonicActivity { stopService(new Intent(this, DownloadServiceImpl.class)); finish(); } else if(getIntent().hasExtra(Constants.INTENT_EXTRA_NAME_DOWNLOAD)) { - getIntent().removeExtra(Constants.INTENT_EXTRA_NAME_DOWNLOAD); - Intent intent = new Intent(); - intent.setClass(this, DownloadActivity.class); - if(getIntent().hasExtra(Constants.INTENT_EXTRA_NAME_DOWNLOAD_VIEW)) { - intent.putExtra(Constants.INTENT_EXTRA_NAME_DOWNLOAD_VIEW, true); + DownloadService service = getDownloadService(); + if(service != null && service.getCurrentPlaying() != null) { + getIntent().removeExtra(Constants.INTENT_EXTRA_NAME_DOWNLOAD); + Intent intent = new Intent(); + intent.setClass(this, DownloadActivity.class); + if(getIntent().hasExtra(Constants.INTENT_EXTRA_NAME_DOWNLOAD_VIEW)) { + intent.putExtra(Constants.INTENT_EXTRA_NAME_DOWNLOAD_VIEW, true); + } + startActivity(intent); } - startActivity(intent); } setContentView(R.layout.abstract_fragment_activity); -- cgit v1.2.3