Merge branch 'release/5.31.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / combo / AbstractComboElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/AbstractComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/AbstractComboElement.java
index 1c608c094dbc9f1aeccb3f4097e5721bdaedabe7..5ff533fda0a199d8ec24b26f8b0655c7f3aff93e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/AbstractComboElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/AbstractComboElement.java
@@ -81,7 +81,7 @@ public abstract class AbstractComboElement<T>
 
     @Override
     public void setBackground(Color color) {
-        if (label != null) {
+        if (label != null && !label.isDisposed()) {
             label.setBackground(color);
         }
     }