From ff41c6763dd0b14a730b05c81867b682d40260fe Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Mon, 6 May 2013 19:33:31 -0700
Subject: [PATCH] Fix for detached illegalstateexception

---
 .../thoughtcrime/securesms/ConversationListFragment.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index 23953f1508..f1168e1d55 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -112,9 +112,12 @@ public class ConversationListFragment extends SherlockListFragment
     searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
       @Override
       public boolean onQueryTextSubmit(String query) {
-        ConversationListFragment.this.queryFilter = query;
-        ConversationListFragment.this.getLoaderManager().restartLoader(0, null, ConversationListFragment.this);
-        return true;
+        if (isAdded()) {
+          ConversationListFragment.this.queryFilter = query;
+          ConversationListFragment.this.getLoaderManager().restartLoader(0, null, ConversationListFragment.this);
+          return true;
+        }
+        return false;
       }
       @Override
       public boolean onQueryTextChange(String newText) {