From 7c0fb4da1f1da06353cfa9512fbef19334a4ccde Mon Sep 17 00:00:00 2001
From: Eugene Ostroukhov
Date: Mon, 19 Sep 2011 10:48:51 +0200
Subject: Bug 356982 - CDT forgets language mappings after the restart

---
 .../org/eclipse/cdt/internal/core/language/LanguageMappingStore.java  | 4 ++--
 1 file 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 2f46ca220f7..09a00f89f14 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();
 
-- 
cgit v1.2.3