diff options
Diffstat (limited to 'platform/platform-impl/src/com/intellij/ui/FocusTrackback.java')
-rw-r--r-- | platform/platform-impl/src/com/intellij/ui/FocusTrackback.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/platform/platform-impl/src/com/intellij/ui/FocusTrackback.java b/platform/platform-impl/src/com/intellij/ui/FocusTrackback.java index 9ad0931c85b9..5c531a7b6ae8 100644 --- a/platform/platform-impl/src/com/intellij/ui/FocusTrackback.java +++ b/platform/platform-impl/src/com/intellij/ui/FocusTrackback.java @@ -191,10 +191,12 @@ public class FocusTrackback { if (app == null || wrongOS() || myConsumed || isSheduledForRestore()) return; Project project = null; - DataContext context = - myParentWindow == null ? DataManager.getInstance().getDataContext() : DataManager.getInstance().getDataContext(myParentWindow); - if (context != null) { - project = CommonDataKeys.PROJECT.getData(context); + DataManager dataManager = DataManager.getInstance(); + if (dataManager != null) { + DataContext context = myParentWindow == null ? dataManager.getDataContext() : dataManager.getDataContext(myParentWindow); + if (context != null) { + project = CommonDataKeys.PROJECT.getData(context); + } } mySheduledForRestore = true; |