ref #8389: fix NPE and smaller issues in preferences

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / preference / menu / NameFeatureMenuPreference.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameFeatureMenuPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameFeatureMenuPreference.java
index 9645d5bcea26f3c83fb7f938f0fcb06c380e349c..4cdc1307f78d610ba96d08433957fbbabd48c334 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameFeatureMenuPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameFeatureMenuPreference.java
@@ -47,9 +47,11 @@ public class NameFeatureMenuPreference extends GeneralTermPreference {
 
     @Override
     public boolean performOk(){
-        boolean result = super.performOk();
-        if (result){
-            PreferencesUtil.createPreferredFeatureTreeForNameDescription();
+        if (isApply()){
+            boolean result = super.performOk();
+            if (result){
+                PreferencesUtil.createPreferredFeatureTreeForNameDescription();
+            }
         }
         return true;