From 235d88f017dc567c5a9eb9d1c872826c56d6662a Mon Sep 17 00:00:00 2001
From: Marc-Andre Laperle <malaperle@omnialabs.net>
Date: Tue, 11 Oct 2011 19:38:04 -0400
Subject: [PATCH] Bug 352256 - NPE when resetting Name Style to defaults

---
 .../org/eclipse/cdt/internal/ui/preferences/NameStyleBlock.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStyleBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStyleBlock.java
index f0f168ea7ec..f31d47696dc 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStyleBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStyleBlock.java
@@ -405,7 +405,7 @@ public class NameStyleBlock extends OptionsConfigurationBlock {
 	@Override
 	protected void validateSettings(Key changedKey, String oldValue, String newValue) {
 		StatusInfo status = new StatusInfo();
-		if (selectedCategory != null) {
+		if (selectedCategory != null && changedKey != null) {
 			NameValidator validator = selectedCategory.getNameValidator();
 			if (changedKey.equals(selectedCategory.getPrefixKey()) ||
 					changedKey.equals(selectedCategory.getAlternativePrefixKey())) {