X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGDesktop.java;h=ca952220a5013b8d67cf24a59b1c310b2b2ec7cf;hb=453fa24ab502aaca4ffccf3590f97c897b9580b3;hp=f3d9a658979b2edb3374485d642003837013ff4b;hpb=dda7fb15c035fe454eae0fe85c29c0df922ec271;p=jalview.git

diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java
index f3d9a65..ca95222 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");
@@ -389,10 +390,6 @@ public class GDesktop extends JFrame
       }
     });
 
-    Float specversion = Platform.isJS() ? Float.valueOf(8)
-            : Float.parseFloat(
-                    System.getProperty("java.specification.version"));
-
     desktopMenubar.add(FileMenu);
     desktopMenubar.add(toolsMenu);
     desktopMenubar.add(HelpMenu);
@@ -404,13 +401,16 @@ public class GDesktop extends JFrame
     FileMenu.add(saveAsState);
     FileMenu.add(loadState);
     FileMenu.addSeparator();
-    FileMenu.add(quit);
-    if (!APQHandlers.setAPQHandlers)
+    if (!APQHandlers.setQuit)
+    {
+      FileMenu.add(quit);
+    }
+    if (!APQHandlers.setAbout)
     {
       HelpMenu.add(aboutMenuItem);
     }
     HelpMenu.add(documentationMenuItem);
-    if (!APQHandlers.setAPQHandlers)
+    if (!APQHandlers.setPreferences)
     {
       toolsMenu.add(preferences);
     }