From 3bc898a63dd85d0229c26dca4fc0153377bb6b44 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mika=C3=ABl=20Barbero?= Date: Tue, 28 May 2013 11:31:16 +0200 Subject: [PATCH] [409262] all ui related operations in commandStackChanged must be protected Change-Id: I5cfdda62d8e019762d1fd7971e155fadf71b0006 --- .../internal/contentmergeviewer/EMFCompareContentMergeViewer.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java index ee6ee9416..cca3ca042 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java @@ -40,6 +40,7 @@ import org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.util.DynamicOb import org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.util.EMFCompareColor; import org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.util.RedoAction; import org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.util.UndoAction; +import org.eclipse.emf.compare.ide.ui.internal.util.SWTUtil; import org.eclipse.emf.compare.rcp.EMFCompareRCPPlugin; import org.eclipse.emf.compare.rcp.ui.internal.EMFCompareConstants; import org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.ICompareAccessor; @@ -360,7 +361,11 @@ public abstract class EMFCompareContentMergeViewer extends ContentMergeViewer im setRightDirty(getEditingDomain().getCommandStack().isRightSaveNeeded()); } - refresh(); + SWTUtil.safeAsyncExec(new Runnable() { + public void run() { + refresh(); + } + }); } /** -- 2.11.4.GIT