From 547715d30b18e206dea8b8e7cbd3ca2a8bb3e601 Mon Sep 17 00:00:00 2001
From: John Cortell <john.cortell@freescale.com>
Date: Fri, 16 Oct 2009 19:25:55 +0000
Subject: [PATCH] [292559] When "Applying" Traditional Memory Rendering
 Preferences an NPE sometimes occurs

---
 .../cdt/debug/ui/memory/traditional/TraditionalRendering.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java
index 4b1ede0a902..a3c08667959 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java
@@ -442,7 +442,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 
     public void applyPreferences()
     {
-    	if(!fRendering.isDisposed())
+    	if(fRendering != null && !fRendering.isDisposed())
     	{
     		IPreferenceStore store = TraditionalRenderingPlugin.getDefault().getPreferenceStore();