From e1df606624d9a18fde6ecb33c0647c2939a9b508 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Tue, 27 Oct 2015 17:45:29 -0700
Subject: Fix for issues where the options menus were not being loaded
 correctly

---
 .../main/java/github/daneren2005/dsub/activity/SubsonicActivity.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'app')

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 a0f3333e..25acdd02 100644
--- a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
+++ b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
@@ -481,9 +481,7 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuInflater menuInflater = getMenuInflater();
 		SubsonicFragment currentFragment = getCurrentFragment();
-		if(drawerOpen) {
-			menuInflater.inflate(R.menu.drawer_menu, menu);
-		} else if(currentFragment != null) {
+		if(currentFragment != null) {
 			try {
 				SubsonicFragment fragment = getCurrentFragment();
 				fragment.setContext(this);
@@ -806,6 +804,7 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
 
 		currentFragment = fragment;
 		currentFragment.setPrimaryFragment(true);
+		supportInvalidateOptionsMenu();
 	}
 
 	public void invalidate() {
-- 
cgit v1.2.3