summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>2013-10-24 15:04:51 +0400
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>2013-10-24 15:04:51 +0400
commit3fa0b2591a71637aa212493f0f7ca4d06a143511 (patch)
tree1255a373087914de6d5db2eb9149dcfb0fbf1ec4
parent4efd6a55119e52b1e142c3944ccdd1163dad5103 (diff)
check if m_adapter is not null in setselectedfeed/cat
-rw-r--r--src/org/fox/ttrss/FeedCategoriesFragment.java7
-rw-r--r--src/org/fox/ttrss/FeedsFragment.java5
2 files changed, 9 insertions, 3 deletions
diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/src/org/fox/ttrss/FeedCategoriesFragment.java
index 8a71c318..30ef0484 100644
--- a/src/org/fox/ttrss/FeedCategoriesFragment.java
+++ b/src/org/fox/ttrss/FeedCategoriesFragment.java
@@ -509,9 +509,12 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
}
}
- public void setSelectedCategory(FeedCategory cat) {
+ public void setSelectedCategory(FeedCategory cat) {
m_selectedCat = cat;
- m_adapter.notifyDataSetChanged();
+
+ if (m_adapter != null) {
+ m_adapter.notifyDataSetChanged();
+ }
}
public FeedCategory getSelectedCategory() {
diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java
index 8b4dd05b..430294ed 100644
--- a/src/org/fox/ttrss/FeedsFragment.java
+++ b/src/org/fox/ttrss/FeedsFragment.java
@@ -743,7 +743,10 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
public void setSelectedFeed(Feed feed) {
m_selectedFeed = feed;
- m_adapter.notifyDataSetChanged();
+
+ if (m_adapter != null) {
+ m_adapter.notifyDataSetChanged();
+ }
}
@Override