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

EA-81435 - NPE: PinActiveTabAction.createHandler

Browse Source
This commit is contained in:
Gregory.Shrago
2016-05-17 21:02:52 +03:00
parent 6edea5d413
commit f77e52cacf
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java
+3 -2
View File
@@ -106,7 +106,8 @@ public class PinActiveTabAction extends DumbAwareAction implements Toggleable {
@Nullable
protected Content getContentFromEvent(@NotNull AnActionEvent e) {
Content content = getNonToolWindowContent(e);
return content != null ? content : getToolWindowContent(e);
if (content == null) content = getToolWindowContent(e);
return content != null && content.isValid() ? content : null;
}
@NotNull
@@ -139,7 +140,7 @@ public class PinActiveTabAction extends DumbAwareAction implements Toggleable {
ContentManager contentManager = ContentManagerUtil.getContentManagerFromContext(e.getDataContext(), true);
result = contentManager != null? contentManager.getSelectedContent() : null;
if (result != null && result.isPinnable()) return result;
return getToolWindowContent(e);
return null;
}
@Nullable