From b87b82849622b452a9a190264087058565ddd40b Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Sun, 8 Jun 2014 14:04:21 -0400 Subject: [PATCH] Bug 436935 - Invalid thread access when exiting Eclipse after debugging Change-Id: I7068ba3558e367c2fde35abbaaa89b9122c0f4b6 Signed-off-by: Marc-Andre Laperle Reviewed-on: https://git.eclipse.org/r/28184 Tested-by: Hudson CI Tested-by: Alvaro Sanchez-Leon Reviewed-by: Elena Laskavaia Reviewed-by: Marc Khouzam --- .../dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java index d5c16747f9e..370cab16355 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java @@ -661,8 +661,8 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl // fSourceLookupParticipant is disposed by the source lookup director // Need to remove annotations in UI thread. - Display display = Display.getDefault(); - if (!display.isDisposed()) { + Display display = PlatformUI.getWorkbench().getDisplay(); + if (display != null && !display.isDisposed()) { display.asyncExec(new Runnable() { @Override public void run() {