From e66bf9e0ab3262464725d2860ba9c55bb70e4d0e Mon Sep 17 00:00:00 2001 From: Egor Zhdan Date: Mon, 21 Jan 2019 10:58:16 +0300 Subject: [PATCH] Disable linux native menu in CLion until OC-18001 is resolved --- .../src/com/intellij/openapi/wm/impl/GlobalMenuLinux.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/GlobalMenuLinux.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/GlobalMenuLinux.java index 2b318d3e7347..a39e9ed27c1b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/GlobalMenuLinux.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/GlobalMenuLinux.java @@ -11,6 +11,7 @@ import com.intellij.openapi.application.Experiments; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.registry.Registry; +import com.intellij.util.PlatformUtils; import com.intellij.util.lang.UrlClassLoader; import com.intellij.util.ui.UIUtil; import com.sun.javafx.application.PlatformImpl; @@ -585,7 +586,7 @@ public class GlobalMenuLinux implements GlobalMenuLib.EventHandler, Disposable { private static GlobalMenuLib _loadLibrary() { try { - if (!SystemInfo.isLinux || Registry.is("linux.native.menu.force.disable")) + if (!SystemInfo.isLinux || Registry.is("linux.native.menu.force.disable") || PlatformUtils.isCLion()) return null; if (!Experiments.isFeatureEnabled("linux.native.menu")) return null;