summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaroline Rieder2013-02-05 15:46:18 (EST)
committer Andrew Gvozdev2013-02-05 16:43:10 (EST)
commitfb4dffcfa0cc55fe1e50604ad0030316f6f204b6 (patch)
tree8719b8146b331be7bbd3bc73b3bb2c923fa5d74e
parentd3160c878f2fca56769930f7fbf7ab1df40ff951 (diff)
downloadorg.eclipse.cdt-fb4dffcfa0cc55fe1e50604ad0030316f6f204b6.zip
org.eclipse.cdt-fb4dffcfa0cc55fe1e50604ad0030316f6f204b6.tar.gz
org.eclipse.cdt-fb4dffcfa0cc55fe1e50604ad0030316f6f204b6.tar.bz2
bug 399906: Unable to unset "Use global provider" in Providers tab of Preprocessor Include paths
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java2
1 files changed, 1 insertions, 1 deletions
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 078e30c..1f57858 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) {