#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 4c4578719796d02838d45ea76fde4f4d018e27e1..7f040a8680ade1770d7d2e0efcbd235db569e885 100644 (file)
--- 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);
                }
        }