From dcb0d4fe95b9f8f1b32b873974a0d28d4ad3cbde Mon Sep 17 00:00:00 2001
From: Caroline Rieder <caroline.rieder@windriver.com>
Date: Tue, 5 Feb 2013 15:46:18 -0500
Subject: [PATCH] bug 399906: Unable to unset "Use global provider" in
 Providers tab of Preprocessor Include paths

---
 .../settings/providers/LanguageSettingsProviderTab.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java
index 078e30ce016..1f57858a33c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java
@@ -483,7 +483,7 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab {
 		} else {
 			// Toggle to configuration-owned provider
 			newProvider = getInitialProvider(id);
-			if(newProvider == null) {
+			if(newProvider == null || LanguageSettingsManager.isWorkspaceProvider(newProvider)) {
 				try {
 					ILanguageSettingsProvider rawProvider = LanguageSettingsManager.getRawProvider(provider);
 					if (rawProvider instanceof ILanguageSettingsEditableProvider) {