summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Ostroukhov2011-09-19 04:48:51 (EDT)
committerAnton Leherbauer2011-09-19 05:16:21 (EDT)
commit7c0fb4da1f1da06353cfa9512fbef19334a4ccde (patch)
tree9c89c8717d97122a8f2f608c1e0ecd6af64a565e
parentd52d24ecbe5f5d05d220a93375f93933f9e77852 (diff)
downloadorg.eclipse.cdt-7c0fb4da1f1da06353cfa9512fbef19334a4ccde.zip
org.eclipse.cdt-7c0fb4da1f1da06353cfa9512fbef19334a4ccde.tar.gz
org.eclipse.cdt-7c0fb4da1f1da06353cfa9512fbef19334a4ccde.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();