From 16e89f442055a6a1a2a5e5ded68dccad1bb914ba Mon Sep 17 00:00:00 2001
From: "Rustam.Vishnyakov" <rustam.vishnyakov@gmail.com>
Date: Wed, 7 Dec 2011 13:03:54 +0400
Subject: [PATCH] EA-31685 NPE fix, correct initialization order. [r=N.Matveev]

---
 .../application/options/codeStyle/CodeStyleMainPanel.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java
index 54bdfc3ac0b6..3ac71f3f27d8 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java
@@ -194,9 +194,9 @@ public class CodeStyleMainPanel extends JPanel implements LanguageSelectorListen
     String name = scheme.getName();
     if (!mySettingsPanels.containsKey(name)) {
       NewCodeStyleSettingsPanel panel = myFactory.createPanel(scheme);
+      panel.setLanguageSelector(myLangSelector);
       panel.reset();
       panel.setModel(myModel);
-      panel.setLanguageSelector(myLangSelector);
       mySettingsPanels.put(name, panel);
       mySettingsPanel.add(scheme.getName(), panel);
       mySchemesPanel.setCodeStyleSettingsPanel(panel);