summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaroline Rieder2013-01-12 05:48:20 (EST)
committerAndrew Gvozdev2013-01-21 09:28:05 (EST)
commit692144cb1953b6c378783c50d9e329e209590a4d (patch)
tree5a797deeec028f78b07714118d5fd18bff227eec
parentb14645923aa933c14a2996e5c1dc365291ba079e (diff)
downloadorg.eclipse.cdt-692144cb1953b6c378783c50d9e329e209590a4d.zip
org.eclipse.cdt-692144cb1953b6c378783c50d9e329e209590a4d.tar.gz
org.eclipse.cdt-692144cb1953b6c378783c50d9e329e209590a4d.tar.bz2
bug 395442: Initial provider command is not restored for non-shared providers
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java9
1 files changed, 6 insertions, 3 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 fefcb4f..078e30c 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
@@ -439,9 +439,12 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab {
if (event.getChecked()) {
if (LanguageSettingsManager.isWorkspaceProvider(checkedProvider) && !LanguageSettingsManager.isPreferShared(id)) {
- ILanguageSettingsProvider rawProvider = LanguageSettingsManager.getRawProvider(checkedProvider);
- if (rawProvider instanceof ILanguageSettingsEditableProvider) {
- newProvider = LanguageSettingsManager.getProviderCopy((ILanguageSettingsEditableProvider) rawProvider, false);
+ newProvider = getInitialProvider(id);
+ if(newProvider == null) {
+ ILanguageSettingsProvider rawProvider = LanguageSettingsManager.getRawProvider(checkedProvider);
+ if (rawProvider instanceof ILanguageSettingsEditableProvider) {
+ newProvider = LanguageSettingsManager.getProviderCopy((ILanguageSettingsEditableProvider) rawProvider, false);
+ }
}
}
} else {