diff options
| author | Mikaël Barbero | 2013-05-28 09:31:16 +0000 |
|---|---|---|
| committer | Laurent Goubet | 2013-05-29 08:34:02 +0000 |
| commit | 5a532fe595b47091a43b31d6eb764400b5a7fab5 (patch) | |
| tree | 40adbd4dd412b8296ab0be229e17561a0572f91f | |
| parent | fe19d16b41a16195d8c14e8e97a4b6381677aed9 (diff) | |
| download | org.eclipse.emf.compare-5a532fe595b47091a43b31d6eb764400b5a7fab5.tar.gz org.eclipse.emf.compare-5a532fe595b47091a43b31d6eb764400b5a7fab5.tar.xz org.eclipse.emf.compare-5a532fe595b47091a43b31d6eb764400b5a7fab5.zip | |
[409262] UI related operations in commandStackChanged must be protected
Bug: 409262
Change-Id: I5cfdda62d8e019762d1fd7971e155fadf71b0006
| -rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java | 7 |
1 files changed, 6 insertions, 1 deletions
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(); + } + }); } /** |