Prevent NPE in menu preparation

cb9cb1b3 · Geoffrey Métais · f0004698 · cb9cb1b3
Commit cb9cb1b3 authored Apr 03, 2018 by Geoffrey Métais
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

vlc-android/src/org/videolan/vlc/gui/browser/SortableFragment.java ...id/src/org/videolan/vlc/gui/browser/SortableFragment.java +2 -1

No files found.
--- a/vlc-android/src/org/videolan/vlc/gui/browser/SortableFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/browser/SortableFragment.java
@@ -58,7 +58,8 @@ public abstract class SortableFragment<T extends SortableAdapter> extends MediaB
    @Override
    public void onPrepareOptionsMenu(Menu menu) {
        super.onPrepareOptionsMenu(menu);
-        menu.findItem(R.id.ml_menu_sortby).setVisible(isSortEnabled());
+        final MenuItem item = menu.findItem(R.id.ml_menu_sortby);
+        if (item != null) item.setVisible(isSortEnabled());
        UiTools.updateSortTitles(this, menu);
    }