Merge branch 'release/5.8.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / databaseAdmin / preferencePage / GeneralAdminPreferencePage.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
index 9459eeffc23d184acb9acb2962938e52b3652533..c5b08b2e146b83733a66f4687bdd8876d37bf9fd 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
@@ -35,7 +35,9 @@ public class GeneralAdminPreferencePage extends GeneralPreferencePage implements
     @Override
     public boolean performOk() {
 
-
+        if (!isApply()){
+            return true;
+        }
        if (controller != null){
            IPreferenceService service = controller.getPreferenceService();