Some menus are freezing #104

nroduit · Oct 31, 2019 · 4017a8b · 4017a8b
1 parent 723a0ec
commit 4017a8b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/DynamicMenu.java b/weasis-core/weasis-core-api/src/main/java/org/weasis/core/api/gui/util/DynamicMenu.java
@@ -58,7 +58,7 @@ public void popupMenuCanceled() {
 
     public void addPopupMenuListener() {
         // #WEA-6 - workaround, PopupMenuListener doesn't work on Mac in the top bar with native look and feel
-        if (Boolean.TRUE.toString().equals(System.getProperty("apple.laf.useScreenMenuBar", Boolean.FALSE.toString()))) { //$NON-NLS-1$
+        if (AppProperties.OPERATING_SYSTEM.startsWith("mac") && Boolean.TRUE.toString().equals(System.getProperty("apple.laf.useScreenMenuBar", Boolean.FALSE.toString()))) { //$NON-NLS-1$
             this.addChangeListener(e -> {
                 if (DynamicMenu.this.isSelected()) {
                 	DynamicMenu.this.removeAll();