From: Cherian Mathew <c.mathew@bgbm.org>
Date: Mon, 19 Oct 2015 12:42:00 +0000 (+0200)
Subject: #5306 Use default language if preferred language is null
X-Git-Tag: 3.12.0^2~87
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/5126cb20cd4cb98013ccde4cb44c3954733a1659

#5306 Use default language if preferred language is null
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java
index 4c4578719..7f040a868 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java
@@ -214,8 +214,9 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
 								.getDefaultLanguage() }));
 
 		element_languageString.setLanguageString(preferredLanguageString);
+
 		if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
-			combo_language.setSelection(preferredLanguageString.getLanguage());
+			combo_language.setSelection(preferredLanguageString == null?CdmStore.getDefaultLanguage():preferredLanguageString.getLanguage());
 			button.setEnabled(true);
 		}
 	}