From 583701042d31d0a4fdf621a0bf7d767be779c7fd Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 5 Aug 2013 16:53:00 +0200
Subject: [PATCH] IDEA-111528 ("missing font" fatality defeated)

---
 .../platform-impl/src/com/intellij/idea/StartupUtil.java   | 7 +++++--
 platform/platform-impl/src/com/intellij/ui/AppUIUtil.java  | 5 ++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
index 2c899dc17454..7b01b1874695 100644
--- a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
+++ b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
@@ -81,8 +81,6 @@ public class StartupUtil {
 
     if (!Main.isHeadless()) {
       AppUIUtil.updateFrameClass();
-      AppUIUtil.updateWindowIcon(JOptionPane.getRootFrame());
-      AppUIUtil.registerBundledFonts();
 
       newConfigFolder = PathManager.ensureConfigFolderExists(true);
       if (newConfigFolder) {
@@ -101,6 +99,11 @@ public class StartupUtil {
     fixProcessEnvironment(log);
     loadSystemLibraries(log);
 
+    if (!Main.isHeadless()) {
+      AppUIUtil.updateWindowIcon(JOptionPane.getRootFrame());
+      AppUIUtil.registerBundledFonts();
+    }
+
     appStarter.start(newConfigFolder);
   }
 
diff --git a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
index 4a7a36f89eca..a9eefcb35c9f 100644
--- a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
+++ b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
@@ -45,7 +45,6 @@ import java.util.List;
  * @author yole
  */
 public class AppUIUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.AppUIUtil");
   private static final String VENDOR_PREFIX = "jetbrains-";
 
   public static void updateWindowIcon(@NotNull Window window) {
@@ -159,7 +158,7 @@ public class AppUIUtil {
       }
     }
     catch (Exception e) {
-      LOG.error("Cannot register font: " + name, e);
+      Logger.getInstance(AppUIUtil.class).error("Cannot register font: " + name, e);
     }
   }
 
@@ -174,4 +173,4 @@ public class AppUIUtil {
       }
     });
   }
-}
\ No newline at end of file
+}