X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=swt%2Forg.argeo.cms.swt%2Fsrc%2Forg%2Fargeo%2Fcms%2Fswt%2FCmsSwtUtils.java;h=d97bc4c35ad2bb89b81663e7d17d15899fd8ded0;hb=HEAD;hp=3a91dbc23dc5db5db2c7569f75d00a272b3f8d42;hpb=556aa2a2a44e763ef14d8fea5c5dd69a9eb9f29e;p=lgpl%2Fargeo-commons.git

diff --git a/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUtils.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUtils.java
index 3a91dbc23..d97bc4c35 100644
--- a/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUtils.java
+++ b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/CmsSwtUtils.java
@@ -61,6 +61,8 @@ public class CmsSwtUtils {
 	}
 
 	public static CmsView getCmsView(Control parent) {
+		if (parent.isDisposed())
+			return null;
 		// find parent shell
 		Shell topShell = parent.getShell();
 		while (topShell.getParent() != null)
@@ -219,7 +221,7 @@ public class CmsSwtUtils {
 
 	/** Style widget */
 	public static <T extends Widget> T style(T widget, String style) {
-		if (style == null)
+		if (style == null || widget.isDisposed())
 			return widget;// does nothing
 		EclipseUiSpecificUtils.setStyleData(widget, style);
 		if (widget instanceof Control) {