From fb7792125b973251a3523842aef3bcc0f04f8bd9 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 26 Sep 2012 09:51:16 +0400
Subject: fix crash in sortfeeds/sortcats when adapter is already destroyed

---
 src/org/fox/ttrss/FeedCategoriesFragment.java | 6 +++++-
 src/org/fox/ttrss/FeedsFragment.java          | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/org')

diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/src/org/fox/ttrss/FeedCategoriesFragment.java
index 793af317..9512da08 100644
--- a/src/org/fox/ttrss/FeedCategoriesFragment.java
+++ b/src/org/fox/ttrss/FeedCategoriesFragment.java
@@ -317,7 +317,11 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
 		}
 		
 		Collections.sort(m_cats, cmp);
-		m_adapter.notifyDataSetInvalidated();
+		try {
+			m_adapter.notifyDataSetInvalidated();
+		} catch (NullPointerException e) {
+			// adapter missing
+		}
 		
 	}
 	
diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java
index 056932b3..a3de1c80 100644
--- a/src/org/fox/ttrss/FeedsFragment.java
+++ b/src/org/fox/ttrss/FeedsFragment.java
@@ -546,7 +546,12 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
 		}
 		
 		Collections.sort(m_feeds, cmp);
-		m_adapter.notifyDataSetInvalidated();
+		
+		try {
+			m_adapter.notifyDataSetInvalidated();
+		} catch (NullPointerException e) {
+			// adapter missing
+		}
 	}
 	
 	public class GetIconsTask extends AsyncTask<FeedList, Integer, Integer> {
-- 
cgit v1.2.3