aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/github/daneren2005/dsub/activity/SubsonicActivity.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/github/daneren2005/dsub/activity/SubsonicActivity.java b/src/github/daneren2005/dsub/activity/SubsonicActivity.java
index 313d6957..07c35336 100644
--- a/src/github/daneren2005/dsub/activity/SubsonicActivity.java
+++ b/src/github/daneren2005/dsub/activity/SubsonicActivity.java
@@ -231,8 +231,10 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte
@Override
public boolean onCreateOptionsMenu(Menu menu) {
- MenuInflater menuInflater = getMenuInflater();
- currentFragment.onCreateOptionsMenu(menu, menuInflater);
+ if(currentFragment != null) {
+ MenuInflater menuInflater = getMenuInflater();
+ currentFragment.onCreateOptionsMenu(menu, menuInflater);
+ }
return true;
}
@Override