Bug 518255 - SWTException below FilteredItemsSelectionDialog$ContentProvider.updateElement

Cherry-picked from 0a823bb.

Change-Id: Idf4aaf926ade2009d23d75d970f4982f3b6fe457

1 files changed, 6 insertions, 2 deletions

diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTableViewer.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTableViewer.java
index f287f71183b..7a254ff3ec2 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTableViewer.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/AbstractTableViewer.java
@@ -18,7 +18,6 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
@@ -85,7 +84,12 @@ public abstract class AbstractTableViewer extends ColumnViewer {
 							// In case event is sent during doUpdateItem() we
 							// should run async update to avoid RuntimeException
 							// from ColumnViewer.checkBusy(), see bug 488484
-							getControl().getDisplay().asyncExec(() -> lazyProvider.updateElement(index));
+							Control control = getControl();
+							control.getDisplay().asyncExec(() -> {
+								if (!control.isDisposed()) {
+									lazyProvider.updateElement(index);
+								}
+							});
 						}
 						return;
 					}