diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java index c87096712..9ce62a0df 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java @@ -131,15 +131,14 @@ public abstract class BaseListFragment extends BaseStateFragment } private int getFocusedPosition() { - View focusedItem = itemsList.getFocusedChild(); - if (focusedItem != null) { - RecyclerView.ViewHolder itemHolder = itemsList.findContainingViewHolder(focusedItem); - if (itemHolder != null) { - return itemHolder.getAdapterPosition(); - } + try { + final View focusedItem = itemsList.getFocusedChild(); + final RecyclerView.ViewHolder itemHolder = + itemsList.findContainingViewHolder(focusedItem); + return itemHolder.getAdapterPosition(); + } catch (NullPointerException e) { + return -1; } - - return -1; } @Override