From f4aa2a7df7c031b4a256c0ac305d18102874fb9d Mon Sep 17 00:00:00 2001 From: Christophe Beyls Date: Fri, 17 Jan 2014 22:08:50 +0100 Subject: [PATCH] Ensure menu data is loaded before calling setHasOptionsMenu() --- src/be/digitalia/fosdem/fragments/BookmarksListFragment.java | 3 ++- src/be/digitalia/fosdem/fragments/PersonInfoListFragment.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/be/digitalia/fosdem/fragments/BookmarksListFragment.java b/src/be/digitalia/fosdem/fragments/BookmarksListFragment.java index e7e76c2..c3e4892 100644 --- a/src/be/digitalia/fosdem/fragments/BookmarksListFragment.java +++ b/src/be/digitalia/fosdem/fragments/BookmarksListFragment.java @@ -40,12 +40,13 @@ public class BookmarksListFragment extends ListFragment implements LoaderCallbac @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setHasOptionsMenu(true); adapter = new EventsAdapter(getActivity()); setListAdapter(adapter); upcomingOnly = getActivity().getPreferences(Context.MODE_PRIVATE).getBoolean(PREF_UPCOMING_ONLY, false); + + setHasOptionsMenu(true); } @Override diff --git a/src/be/digitalia/fosdem/fragments/PersonInfoListFragment.java b/src/be/digitalia/fosdem/fragments/PersonInfoListFragment.java index e80a916..1dde91a 100644 --- a/src/be/digitalia/fosdem/fragments/PersonInfoListFragment.java +++ b/src/be/digitalia/fosdem/fragments/PersonInfoListFragment.java @@ -42,10 +42,10 @@ public class PersonInfoListFragment extends ListFragment implements LoaderCallba @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setHasOptionsMenu(true); adapter = new EventsAdapter(getActivity()); person = getArguments().getParcelable(ARG_PERSON); + setHasOptionsMenu(true); } @Override