diff options
Diffstat (limited to 'platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java')
-rw-r--r-- | platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java b/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java index ac197b192284..340fbb9ae186 100644 --- a/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,18 +49,17 @@ public class HelpManagerImpl extends HelpManager { private Object myFXHelpBrowser = null; public void invokeHelp(@Nullable String id) { - if (myHelpSet == null) { myHelpSet = createHelpSet(); } - if (SystemInfo.isJavaVersionAtLeast("1.7.0.40") && Registry.is("ide.help.fxbrowser")) { - showHelpInFXBrowser(id); + if (MacHelpUtil.isApplicable() && MacHelpUtil.invokeHelp(id)) { return; } - if (MacHelpUtil.isApplicable()) { - if (MacHelpUtil.invokeHelp(id)) return; + if (SystemInfo.isJavaVersionAtLeast("1.7.0.40") && Registry.is("ide.help.fxbrowser")) { + showHelpInFXBrowser(id); + return; } if (myHelpSet == null) { |