MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

ui: fix NPE

Browse Source 
follow-up: b9096dc
This commit is contained in:
Aleksey Pivovarov
2017-04-26 16:57:24 +03:00
parent 82a4bd2dba
commit 285be6ff93
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java
+2 -2
View File
@@ -200,10 +200,10 @@ public class KeymapUtil {
}
@NotNull
public static ShortcutSet getActiveKeymapShortcuts(@NotNull String actionId) {
public static ShortcutSet getActiveKeymapShortcuts(@Nullable String actionId) {
Application application = ApplicationManager.getApplication();
KeymapManager keymapManager = application == null ? null : application.getComponent(KeymapManager.class);
if (keymapManager == null) {
if (keymapManager == null || actionId == null) {
return new CustomShortcutSet(Shortcut.EMPTY_ARRAY);
}
return new CustomShortcutSet(keymapManager.getActiveKeymap().getShortcuts(actionId));