MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-26 19:06:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-155151 NPE on startup on clean installation (when lo license is present)

Browse Source
This commit is contained in:
Sergey Malenkov
2016-04-25 12:47:04 +03:00
parent 306d16f2b4
commit 591b2184a0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java
+3 -1
View File
@@ -17,6 +17,7 @@ package com.intellij.ui.components;
import com.intellij.openapi.actionSystem.ActionManager;
import com.intellij.openapi.actionSystem.KeyboardShortcut;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.registry.Registry;
@@ -177,8 +178,9 @@ public class JBScrollPane extends JScrollPane {
}
private static void updateInputMap(InputMap map, String prefix, String... actions) {
if (map != null) {
if (map != null && null != ApplicationManager.getApplication()) {
ActionManager manager = ActionManager.getInstance();
if (manager != null)
for (String action : actions) {
KeyboardShortcut shortcut = manager.getKeyboardShortcut(prefix + action);
if (shortcut != null) map.put(shortcut.getFirstKeyStroke(), action);