From 1a401ae41e19d4e0e5e8657b08d1382543c325d8 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Nov 2014 09:34:00 +0300
Subject: [PATCH] fix crash in headlinesfragment b/c not checking whether
 flavor image exists

---
 org.fox.ttrss/src/main/AndroidManifest.xml                    | 4 ++--
 .../src/main/java/org/fox/ttrss/HeadlinesFragment.java        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 313cf45e..d372ab05 100644
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="258"
-    android:versionName="1.54" >
+    android:versionCode="259"
+    android:versionName="1.55" >
 
     <uses-sdk
         android:minSdkVersion="9"
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
index 2b7cd8c6..8c832520 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -905,7 +905,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
                 } else if (holder.flavorImageHolder != null) {
                     holder.flavorImageHolder.setVisibility(View.GONE);
                 }
-            } else {
+            } else if (holder.flavorImageHolder != null) {
                 holder.flavorImageHolder.setVisibility(View.GONE);
             }