X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/248f5a5acb7a26396fb469a59ff0a8c4a09646cf..42f394505fd03d636d80ffe6a93078b2ca8bd7a3:/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
index 8bb34daab..c4e708be4 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
@@ -24,6 +24,7 @@ import org.springframework.security.core.GrantedAuthority;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
+import eu.etaxonomy.cdm.api.service.IService;
 import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Group;
@@ -420,10 +421,13 @@ public class EntitySelectionElement<T extends CdmBase> extends
 		/** {@inheritDoc} */
 		@Override
 		public void widgetSelected(SelectionEvent e) {
-			if (StoreUtil.getActiveEditor().isDirty()){
-				MessageDialog.openInformation(null,"Save changes", "You have made changes that must be saved before this query can be executed");
-				return;
-			}
+
+	        IService<T> service = CdmStore.getService(entity);
+	        T loadedEntity = service.load(entity.getUuid());
+            if (loadedEntity==null){
+	            MessageDialog.openInformation(null,"Save changes", "You have made changes that must be saved before this query can be executed");
+	            return;
+	        }
 			WizardDialog dialog = new WizardDialog(selectionElement.getShell(),
 					new EditFromSelectionWizard(selectionElement));
 			if (dialog.open() == IStatus.OK) {