Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Richard2015-06-18 12:24:43 +0000
committerAxel RICHARD2015-07-10 07:34:23 +0000
commitd9d1e37aa60c19d79970a7b6bb4b1380e430be07 (patch)
treecab2de2a22184998cccb0dba86a066a5cc75ce69
parent91638057519e1685f87d8e6bcecff5df9afd9c46 (diff)
downloadorg.eclipse.emf.compare-d9d1e37aa60c19d79970a7b6bb4b1380e430be07.tar.gz
org.eclipse.emf.compare-d9d1e37aa60c19d79970a7b6bb4b1380e430be07.tar.xz
org.eclipse.emf.compare-d9d1e37aa60c19d79970a7b6bb4b1380e430be07.zip
[453408] Fix SWTException in EMFCSMV#internalRedraw()
Bug: 453408 Change-Id: I6aa0b7a117e5d81dc8c47f2152dd6b025b887d45 Signed-off-by: Axel Richard <axel.richard@obeo.fr>
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java
index 8f8e4f873..c3eee9e16 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java
@@ -1375,7 +1375,12 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap
* the redraw on its sub components under windows platform.
*/
private void internalRedraw() {
- getViewer().getTree().redraw();
- treeRuler.redraw();
+ Tree tree = getViewer().getTree();
+ if (!tree.isDisposed()) {
+ tree.redraw();
+ if (!treeRuler.isDisposed()) {
+ treeRuler.redraw();
+ }
+ }
}
}

Back to the top