summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaroline Rieder2013-01-12 05:48:20 (EST)
committerAndrew Gvozdev2013-01-13 09:58:21 (EST)
commit3222ba63edd499f7ad7f25087f9c496ec0433e02 (patch)
tree797e105fd0b3c8171ffb57aae4096fbef308cd5d
parent2f425c4386bf457f46345c32ccee2fb410a92ecf (diff)
downloadorg.eclipse.cdt-3222ba63edd499f7ad7f25087f9c496ec0433e02.zip
org.eclipse.cdt-3222ba63edd499f7ad7f25087f9c496ec0433e02.tar.gz
org.eclipse.cdt-3222ba63edd499f7ad7f25087f9c496ec0433e02.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 {