diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/NST.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/NST.java index 5505840004fe..2bdbacdeecb5 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/NST.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/NST.java @@ -21,18 +21,16 @@ import java.util.Map; public class NST { private static final Logger LOG = Logger.getInstance(NST.class); private static final String ourRegistryKeyTouchbar = "ide.mac.touchbar.use"; - private static final String ourRegistryKeyDoCheckEnv = "ide.mac.touchbar.check.env"; private static final NSTLibrary ourNSTLibrary; // NOTE: JNA is stateless (doesn't have any limitations of multi-threaded use) static { final boolean isSystemSupportTouchbar = SystemInfo.isMac && SystemInfo.isOsVersionAtLeast("10.12.2"); final boolean isRegistryKeyEnabled = Registry.is(ourRegistryKeyTouchbar, false); - final boolean doCheckEnv = Registry.is(ourRegistryKeyDoCheckEnv, true); NSTLibrary lib = null; if ( isSystemSupportTouchbar && isRegistryKeyEnabled - && (!doCheckEnv || SystemSettingsTouchBar.isTouchBarServerRunning()) + && SystemSettingsTouchBar.isTouchBarServerRunning() ) { try { UrlClassLoader.loadPlatformLibrary("nst"); diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index cec0c2a3b1ea..e41642be76a4 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -1297,7 +1297,7 @@ markdown.clear.cache.interval=600000 ide.mac.new.color.picker=false ide.mac.touchbar.use = true -ide.mac.touchbar.check.env = true +ide.mac.touchbar.use.description=Enable MacBook Touch Bar support trace.focus.on.app.activation=false trace.focus.on.app.activation.description=Focus tracing on application activation and deactivation