bugfix for grammar loading if the start and the target language happen to be the same

1 files changed, 11 insertions, 4 deletions

diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
index 9e5d7484b..ea64a4214 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java
@@ -80,12 +80,19 @@ public class Translator {
 		mGrammarLoader = new GrammarLoader();
 		mGrammarLoader.start();
 		
-        mSourceLoader = new ConcrLoader(getPrefLang(SOURCE_LANG_KEY, 0));
+		Language prefSourceLang = getPrefLang(SOURCE_LANG_KEY, 0);
+		Language prefTargetLang = getPrefLang(TARGET_LANG_KEY, 1);
+		
+        mSourceLoader = new ConcrLoader(prefSourceLang);
         mSourceLoader.start();
         
-        mTargetLoader = new ConcrLoader(getPrefLang(TARGET_LANG_KEY, 1));
-        mTargetLoader.start();
-        
+        if (prefSourceLang == prefTargetLang) {
+        	mTargetLoader = mSourceLoader;
+        } else {
+        	mTargetLoader = new ConcrLoader(prefTargetLang);
+        	mTargetLoader.start();
+        }
+
         mOtherLoader = null;
     }