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

NPE if a previous focus owner is null.

Browse Source
This commit is contained in:
Denis Fokin
2014-05-28 21:12:52 +04:00
parent d27fd1ee45
commit 0529ff579d
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ui/messages/SheetMessage.java
+14 -1
View File
@@ -20,6 +20,7 @@ import com.intellij.openapi.application.impl.LaterInvocator;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.wm.IdeFocusManager;
import com.intellij.openapi.wm.ex.WindowManagerEx;
import com.intellij.ui.Gray;
import com.intellij.ui.JBColor;
@@ -116,7 +117,19 @@ public class SheetMessage {
LaterInvocator.enterModal(myWindow);
myWindow.setVisible(true);
LaterInvocator.leaveModal(myWindow);
beforeShowFocusOwner.get().requestFocus();
Component focusCandidate = beforeShowFocusOwner.get();
if (focusCandidate == null) {
focusCandidate = IdeFocusManager.getGlobalInstance().getLastFocusedFor(IdeFocusManager.getGlobalInstance().getLastFocusedFrame());
}
LOG.assertTrue(focusCandidate != null, "The should return focus on closing the message");
if (focusCandidate != null) {
focusCandidate.requestFocus();
}
}
private void setWindowOpacity(float opacity) {