From 6d2b87d385067cf52abd04d8481a8042d6f681f0 Mon Sep 17 00:00:00 2001 From: Jake McGinty Date: Mon, 13 Apr 2015 11:49:08 -0700 Subject: [PATCH] don't change cursor if adapter is null Fixes #2970 Closes #2977 // FREEBIE --- src/org/thoughtcrime/securesms/ConversationFragment.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java index 5b27283c01..1660b9b113 100644 --- a/src/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationFragment.java @@ -283,12 +283,16 @@ public class ConversationFragment extends ListFragment @Override public void onLoadFinished(Loader arg0, Cursor cursor) { - ((CursorAdapter)getListAdapter()).changeCursor(cursor); + if (getListAdapter() != null) { + ((CursorAdapter) getListAdapter()).changeCursor(cursor); + } } @Override public void onLoaderReset(Loader arg0) { - ((CursorAdapter)getListAdapter()).changeCursor(null); + if (getListAdapter() != null) { + ((CursorAdapter) getListAdapter()).changeCursor(null); + } } public interface ConversationFragmentListener {