summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Ostroukhov2011-09-19 04:48:51 (EDT)
committer Anton Leherbauer2011-09-19 05:10:25 (EDT)
commit0fd03f628b500d541ea69545569068b57a05821b (patch)
treeaf917c28a91ca5e1a138fe16a4a1384976f9a706
parent01b24ceba436b57970ceac00c9b2c22c48bd52a3 (diff)
downloadorg.eclipse.cdt-0fd03f628b500d541ea69545569068b57a05821b.zip
org.eclipse.cdt-0fd03f628b500d541ea69545569068b57a05821b.tar.gz
org.eclipse.cdt-0fd03f628b500d541ea69545569068b57a05821b.tar.bz2
Bug 356982 - CDT forgets language mappings after the restart
-rw-r--r--core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/LanguageMappingStore.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/LanguageMappingStore.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/LanguageMappingStore.java
index 2f46ca2..09a00f8 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/LanguageMappingStore.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/LanguageMappingStore.java
@@ -203,9 +203,9 @@ public class LanguageMappingStore {
public WorkspaceLanguageConfiguration decodeWorkspaceMappings() throws CoreException {
IEclipsePreferences node = InstanceScope.INSTANCE.getNode(CCorePlugin.PLUGIN_ID);
IEclipsePreferences defaultNode = DefaultScope.INSTANCE.getNode(CCorePlugin.PLUGIN_ID);
- String encodedMappings = defaultNode.get(CCorePreferenceConstants.WORKSPACE_LANGUAGE_MAPPINGS, null);
+ String encodedMappings = node.get(CCorePreferenceConstants.WORKSPACE_LANGUAGE_MAPPINGS, null);
if (encodedMappings == null) {
- encodedMappings = node.get(CCorePreferenceConstants.WORKSPACE_LANGUAGE_MAPPINGS, null);
+ encodedMappings = defaultNode.get(CCorePreferenceConstants.WORKSPACE_LANGUAGE_MAPPINGS, null);
}
WorkspaceLanguageConfiguration config = new WorkspaceLanguageConfiguration();