IDEA-149135 Start failed when using JDK6 as IDEA_JDK

This commit is contained in:
Maxim.Mossienko
2015-12-10 17:42:53 +01:00
parent 8ad1f5caf6
commit 5046a58f4e
@@ -16,6 +16,7 @@
package com.intellij.ui;
import com.intellij.ide.StartupProgress;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ex.ApplicationInfoEx;
import com.intellij.openapi.application.impl.ApplicationInfoImpl;
import com.intellij.openapi.util.IconLoader;
@@ -181,7 +182,7 @@ public class Splash extends JDialog implements StartupProgress {
int offsetX = uiScale(15);
int offsetY = 30;
if (Registry.is("ide.new.about")) {
ApplicationInfoEx infoEx = ApplicationInfoEx.getInstanceEx();
ApplicationInfoEx infoEx = ApplicationManager.getApplication() != null ? ApplicationInfoEx.getInstanceEx() : null;
if (infoEx instanceof ApplicationInfoImpl) {
offsetX = Math.max(offsetX, ((ApplicationInfoImpl)infoEx).getProgressX());
offsetY = ((ApplicationInfoImpl)infoEx).getLicenseOffsetY();