From 934b9d06684401d0df0fd75702c5ad2eae378cfb Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Thu, 9 Mar 2017 17:43:08 +0100
Subject: [PATCH] IDEA-169363 Internal error on stating RubyMine EAP

---
 platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.kt b/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.kt
index 494b0366d992..82af5eefc5fb 100644
--- a/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.kt
+++ b/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.kt
@@ -303,7 +303,7 @@ class UISettings : BaseState(), PersistentStateComponent<UISettings> {
     val shadowInstance: UISettings
       get() {
         val app = ApplicationManager.getApplication()
-        return (if (app == null) null else instance) ?: UISettings().withDefFont()
+        return (if (app == null) null else instanceOrNull) ?: UISettings().withDefFont()
       }
 
     private val systemFontFaceAndSize: Pair<String, Int>