This commit is contained in:
Dennis Ushakov
2011-11-02 14:54:01 +04:00
parent 1deb547b6f
commit 1c2f7a3359
@@ -812,7 +812,10 @@ public class FocusManagerImpl extends IdeFocusManager implements Disposable {
Component result = null;
if (!ApplicationManager.getApplication().isActive()) {
result = myLastFocusedAtDeactivation.get(getLastFocusedFrame()).get();
final WeakReference<Component> ref = myLastFocusedAtDeactivation.get(getLastFocusedFrame());
if (ref != null) {
result = ref.get();
}
} else if (myRunContext != null) {
result = (Component)myRunContext.getData(PlatformDataKeys.CONTEXT_COMPONENT.getName());
}