From ca5b78f9c2f1b0538f58fa672283a04cb2f38ad3 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 14 Mar 2012 15:41:07 +0100
Subject: [PATCH] Fix NCDFE on update

---
 platform/bootstrap/src/com/intellij/idea/Main.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/platform/bootstrap/src/com/intellij/idea/Main.java b/platform/bootstrap/src/com/intellij/idea/Main.java
index 808b6759fbeb..69d9c6648b5a 100644
--- a/platform/bootstrap/src/com/intellij/idea/Main.java
+++ b/platform/bootstrap/src/com/intellij/idea/Main.java
@@ -21,7 +21,6 @@ import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.Restarter;
-import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NonNls;
 
 import javax.swing.*;
@@ -66,7 +65,7 @@ public class Main {
       }
 
       if (!restarted && restartCode == 0) {
-        UIUtil.initDefaultLAF();
+        try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (Exception ignore) { }
         String msg = "The application cannot start right away since some critical files have been changed.\nPlease restart it manually.";
         JOptionPane.showMessageDialog(null, msg, "Update", JOptionPane.INFORMATION_MESSAGE);
       }