mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-17 05:05:43 +02:00
Code Issues Wiki Activity

Bug 529762 - [launchbar] "widget is disposed" sometimes at startup

Browse source 
Additional isDisposed checks added to prevent unhandled event loop
exceptions at platform startup on new workspaces.

Change-Id: Ib2e33def766c23719e483496d110644a2cd8a712
Signed-off-by: Mat Booth <mat.booth@redhat.com>
This commit is contained in:
Mat Booth 2018-01-17 11:37:56 +00:00
parent 494fbe48cb
commit b56b76df66
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/LaunchBarControl.java
View file

@ -182,6 +182,10 @@ public class LaunchBarControl implements ILaunchBarListener {
@Override @Override
public void activeLaunchDescriptorChanged(ILaunchDescriptor descriptor) { public void activeLaunchDescriptorChanged(ILaunchDescriptor descriptor) {
if (container == null || container.isDisposed()) {
return;
}
container.getDisplay().asyncExec(() -> { container.getDisplay().asyncExec(() -> {
if (configSelector != null) { if (configSelector != null) {
configSelector.setDelayedSelection(descriptor, SELECTION_DELAY); configSelector.setDelayedSelection(descriptor, SELECTION_DELAY);
@ -191,13 +195,19 @@ public class LaunchBarControl implements ILaunchBarListener {
if (targetSelector == null || targetSelector.isDisposed()) { if (targetSelector == null || targetSelector.isDisposed()) {
createTargetSelector(); createTargetSelector();
syncSelectors(); syncSelectors();
container.getParent().layout(true); if (!container.isDisposed()) {
Composite parent = container.getParent();
parent.layout(true);
}
} }
} else { } else {
if (targetSelector != null && !targetSelector.isDisposed()) { if (targetSelector != null && !targetSelector.isDisposed()) {
onLabel.dispose(); onLabel.dispose();
targetSelector.dispose(); targetSelector.dispose();
container.getParent().layout(true); if (!container.isDisposed()) {
Composite parent = container.getParent();
parent.layout(true);
}
} }
} }
}); });