From 3815a4b8ad50e1987aa7c3028a8cd200d381d060 Mon Sep 17 00:00:00 2001
From: Warren Paul <warren.paul@nokia.com>
Date: Fri, 4 Jun 2010 23:26:25 +0000
Subject: [PATCH]  Bug 315835 -  NPE in DisassemblyPart

---
 .../cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
index c351d119c10..e10f4f341c4 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
@@ -1386,7 +1386,7 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem
 				if (previousPos instanceof LabelPosition) {
 					revealOffset = previousPos.offset;
 					onTop = true;
-				} else if (!previousPos.fValid) {
+				} else if (previousPos == null || !previousPos.fValid) {
 					onTop = true;
 				}
 			} catch (BadLocationException e) {