X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGDesktop.java;h=459835d67d3f09f260d387bd031f8ed71a5fcb12;hp=e3f171df98d96bd46371d3fdc132fdfec869c6fb;hb=f9574ab683df8d0c9dfda092c9005ca773c38e55;hpb=c9800715ec36a57a6e6afb13a57b927e4061242e diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java index e3f171d..459835d 100755 --- a/src/jalview/jbgui/GDesktop.java +++ b/src/jalview/jbgui/GDesktop.java @@ -140,6 +140,7 @@ public class GDesktop extends JFrame */ private void jbInit() throws Exception { + boolean apqHandlersSet = false; /** * APQHandlers sets handlers for About, Preferences and Quit actions * peculiar to macOS's application menu. APQHandlers will check to see if a @@ -147,7 +148,7 @@ public class GDesktop extends JFrame */ try { - APQHandlers.setAPQHandlers(this); + apqHandlersSet = APQHandlers.setAPQHandlers(this); } catch (Exception e) { System.out.println("Cannot set APQHandlers"); @@ -401,12 +402,12 @@ public class GDesktop extends JFrame FileMenu.add(loadState); FileMenu.addSeparator(); FileMenu.add(quit); - if (!APQHandlers.setAPQHandlers) + if (!APQHandlers.setAbout) { HelpMenu.add(aboutMenuItem); } HelpMenu.add(documentationMenuItem); - if (!APQHandlers.setAPQHandlers) + if (!APQHandlers.setPreferences) { toolsMenu.add(preferences); }