diff options
| author | Anton Leherbauer | 2008-08-01 10:56:35 +0000 |
|---|---|---|
| committer | Anton Leherbauer | 2008-08-01 10:56:35 +0000 |
| commit | 47af3d8cf00213de065f520e7a0435aa67ebe2da (patch) | |
| tree | 9cd8f915060302f2ad539cb690c877395931b302 | |
| parent | 1ac1d3ec9d7b5328b4e873e4b58bc9c66bceed9b (diff) | |
| download | org.eclipse.cdt-47af3d8cf00213de065f520e7a0435aa67ebe2da.tar.gz org.eclipse.cdt-47af3d8cf00213de065f520e7a0435aa67ebe2da.tar.xz org.eclipse.cdt-47af3d8cf00213de065f520e7a0435aa67ebe2da.zip | |
Bug 242335 - Eclipse Ganymede hangs on startup
| -rw-r--r-- | core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java | 6 | ||||
| -rw-r--r-- | core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java index 4cceee2560c..d3d7d5658aa 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java @@ -324,9 +324,11 @@ public abstract class AbstractCModelOutlinePage extends Page implements IContent int offset = editorSelection.getOffset(); - ICElement editorElement; + ICElement editorElement= null; try { - editorElement = fInput.getElementAtOffset(offset); + if (fInput.isStructureKnown() && fInput.isConsistent()) { + editorElement = fInput.getElementAtOffset(offset); + } } catch (CModelException e) { return; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java index 2cd821ba6b8..b06b5b3b3a7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java @@ -1716,7 +1716,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IC ((IWorkingCopy) unit).reconcile(); } return unit.getElementAtOffset(offset); - } else if (unit.isConsistent()) { + } else if (unit.isStructureKnown() && unit.isConsistent()) { return unit.getElementAtOffset(offset); } } catch (CModelException x) { |