Merge branch 'master' into protected/gallery-model

1 files changed, 14 insertions, 10 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
index e6daed4b..87bdc96f 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
@@ -559,17 +559,21 @@ public class FeedsFragment extends Fragment implements OnSharedPreferenceChangeL
 		}
 
 		public int getPositionOf(Feed feed) {
-			List<Feed> feeds = getCurrentList();
-
-			return IntStream.range(0, feeds.size())
-					.sequential()
-					.filter(i -> {
-						Feed f = feeds.get(i);
+			if (feed != null) {
+				List<Feed> feeds = getCurrentList();
+
+				return IntStream.range(0, feeds.size())
+						.sequential()
+						.filter(i -> {
+							Feed f = feeds.get(i);
+
+							return f.id == feed.id && f.is_cat == feed.is_cat;
+						})
+						.findFirst()
+						.orElse(-1);
+			}
 
-						return f.id == feed.id && f.is_cat == feed.is_cat;
-					})
-					.findFirst()
-					.orElse(-1);
+			return -1;
 		}
 	}