From a885f7c8a922db2e76adbcd64517ba6bda54bb26 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sat, 5 Sep 2015 17:43:37 +0000
Subject: [PATCH] Fix canceling of search filter selection

---
 .../filters/AdvancedSearchFilter.java          | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java
index 3b2cd95840a..73802114be5 100644
--- a/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java
+++ b/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java
@@ -253,18 +253,16 @@ public class AdvancedSearchFilter<T extends InventoryItem> extends ItemFilter<T>
                         FThreads.invokeInBackgroundThread(new Runnable() {
                             @Override
                             public void run() {
-                                filter = AdvancedSearch.getFilter(itemManager.getGenericType());
-                                FThreads.invokeInEdtLater(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        if (filter == null) {
-                                            btnFilter.setText(emptyFilterText);
-                                        }
-                                        else {
+                                final AdvancedSearch.Filter<T> newFilter = AdvancedSearch.getFilter(itemManager.getGenericType());
+                                if (newFilter != null) {
+                                    FThreads.invokeInEdtLater(new Runnable() {
+                                        @Override
+                                        public void run() {
+                                            filter = newFilter;
                                             btnFilter.setText(filter.toString());
                                         }
-                                    }
-                                });
+                                    });
+                                }
                             }
                         });
                     }