More work on EQ failure conditions

2 files changed, 14 insertions, 7 deletions

diff --git a/src/github/daneren2005/dsub/fragments/NowPlayingFragment.java b/src/github/daneren2005/dsub/fragments/NowPlayingFragment.java
index 189e2a0c..eb4ce5ab 100644
--- a/src/github/daneren2005/dsub/fragments/NowPlayingFragment.java
+++ b/src/github/daneren2005/dsub/fragments/NowPlayingFragment.java
@@ -55,6 +55,7 @@ import android.widget.TextView;
 import android.widget.ViewFlipper;

 import github.daneren2005.dsub.R;

 import github.daneren2005.dsub.activity.SubsonicFragmentActivity;

+import github.daneren2005.dsub.audiofx.EqualizerController;

 import github.daneren2005.dsub.domain.Bookmark;

 import github.daneren2005.dsub.domain.PlayerState;

 import github.daneren2005.dsub.domain.RepeatMode;

@@ -814,14 +815,19 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
 				return true;

 			case R.id.menu_equalizer: {

 				DownloadService downloadService = getDownloadService();

-				if (downloadService != null && downloadService.getEqualizerController() != null

-						&& downloadService.getEqualizerController().getEqualizer() != null) {

-					SubsonicFragment fragment = new EqualizerFragment();

-					replaceFragment(fragment);

-					setControlsVisible(true);

-				} else {

-					Util.toast(context, "Failed to start equalizer.  Try restarting.");

+				if (downloadService != null) {

+					EqualizerController controller = downloadService.getEqualizerController();

+					if(controller != null) {

+						SubsonicFragment fragment = new EqualizerFragment();

+						replaceFragment(fragment);

+						setControlsVisible(true);

+

+						return true;

+					}

 				}

+

+				// Any failed condition will get here

+				Util.toast(context, "Failed to start equalizer.  Try restarting.");

 				return true;

 			} default:

 				return false;

diff --git a/src/github/daneren2005/dsub/service/DownloadService.java b/src/github/daneren2005/dsub/service/DownloadService.java
index d4344e5b..aa03acc5 100644
--- a/src/github/daneren2005/dsub/service/DownloadService.java
+++ b/src/github/daneren2005/dsub/service/DownloadService.java
@@ -1242,6 +1242,7 @@ public class DownloadService extends Service {
 			} catch(Exception e2) {
 				Log.w(TAG, "Failed to setup EQ even after reinitialization");
 				// Don't try again, just resetup media player and continue on
+				controller = null;
 			}
 			
 			// Restart from same position and state we left off in