locator for IdeFocusManager fixed, for semi-initialized application (idea server dialog showing)

This commit is contained in:
Kirill Kalishev
2010-02-09 11:42:40 +03:00
parent b433862052
commit b8a32fae09
@@ -132,9 +132,17 @@ public abstract class IdeFocusManager {
public abstract Expirable getTimestamp(boolean trackOnlyForcedCommands);
@NotNull
public static IdeFocusManager getGlobalInstance() {
Application app = ApplicationManager.getApplication();
return app != null ? app.getComponent(IdeFocusManager.class) : PassThroughtIdeFocusManager.getInstance();
IdeFocusManager fm = app != null ? app.getComponent(IdeFocusManager.class) : PassThroughtIdeFocusManager.getInstance();
// It happens when IDEA server dialog is shown, app != null but it's semi-initialized
if (fm == null) {
fm = PassThroughtIdeFocusManager.getInstance();
}
return fm;
}
}