From f482300fd16cda2323583adab046e21053c004eb Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Wed, 2 Dec 2015 21:53:41 +0000
Subject: [PATCH] bugfixes in the app

---
 .../ui/android/AlternativesActivity.java           | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java b/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java
index 8027441b0..963f24556 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java
@@ -491,16 +491,22 @@ public class AlternativesActivity extends ListActivity {
 		}
 		
 		void filterOnTopics(List<Topic> selected_topics) {
-			if (mSourceTopic != null && !selected_topics.contains(mSourceTopic))
-				mAlternatives = null;
+			if (mSourceTopic != null && !selected_topics.contains(mSourceTopic)) {
+				mAlternatives         = null;
+				mOriginalAlternatives = null;
+				mTopics               = null;
+				mAllTopics            = mOriginalAllTopics;
+			}
 
 			if (mAlternatives == null) {
-				if (selected_topics.size() == 0)
+				if (selected_topics.size() == 0) {
+					notifyDataSetChanged();
 					return;
+				}
 
 				mSourceTopic = selected_topics.get(0);
 				mAlternatives = mTranslator.getTopicWords(mSourceTopic.expr);
-				
+
 				mTopics = new ArrayList<List<Topic>>();
 				for (Expr e : mAlternatives) {
 					List<Topic> topics = new ArrayList<Topic>();