From 0ba89e631c1fae8665bcb2a14ed0b87cb1316944 Mon Sep 17 00:00:00 2001 From: David Inglis Date: Wed, 6 Nov 2002 19:26:58 +0000 Subject: [PATCH] fixes errors when no compiler info exits --- core/org.eclipse.cdt.ui/ChangeLog | 5 ++++- .../src/org/eclipse/cdt/ui/CUIPlugin.java | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 1a454016a6c..2dc26e03b23 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,5 +1,8 @@ -2002-11-01 +2002-11-06 David Inglis + * src/.../ui/CUIPlugin.java + fixed NPE. +2002-11-01 David Inglis * src/.../internal/ui/CElementLabelProvider.java change cpu display string to use isLittleEndian method on IBinary diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java index 3bd8a0e97f7..8272bf0a756 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java @@ -184,8 +184,10 @@ public class CUIPlugin extends AbstractUIPlugin { } if (fImageDescriptorRegistry != null) fImageDescriptorRegistry.dispose(); - fBuildConsoleManager.shutdown(); - fBuildConsoleManager = null; + if ( fBuildConsoleManager != null ) { + fBuildConsoleManager.shutdown(); + fBuildConsoleManager = null; + } super.shutdown(); }