From 5bcff72003aa8922778ab0ca399dfc431d38f744 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Mon, 21 Sep 2015 09:17:18 -0700 Subject: Fix wrong overflow menu on EQ/Lyrics fragments --- .../java/github/daneren2005/dsub/activity/SubsonicActivity.java | 5 +++-- .../github/daneren2005/dsub/activity/SubsonicFragmentActivity.java | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'app/src') diff --git a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java index cd746516..d67893ef 100644 --- a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java +++ b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java @@ -493,8 +493,9 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte menuInflater.inflate(R.menu.drawer_menu, menu); } else if(currentFragment != null) { try { - currentFragment.setContext(this); - currentFragment.onCreateOptionsMenu(menu, menuInflater); + SubsonicFragment fragment = getCurrentFragment(); + fragment.setContext(this); + fragment.onCreateOptionsMenu(menu, menuInflater); if(isTouchscreen()) { menu.setGroupVisible(R.id.not_touchscreen, false); diff --git a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java index 7808d8c0..7cb11392 100644 --- a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java +++ b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java @@ -458,7 +458,11 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo @Override protected SubsonicFragment getCurrentFragment() { if(slideUpPanel.getPanelState() == SlidingUpPanelLayout.PanelState.EXPANDED) { - return nowPlayingFragment; + if(secondaryFragment == null) { + return nowPlayingFragment; + } else { + return secondaryFragment; + } } else { return super.getCurrentFragment(); } -- cgit v1.2.3