JAL-915 - ensured that exceptions are not raised in applet or application, and that...

[jalview.git] / src / jalview / appletgui / APopupMenu.java

diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index c202fd2..5d05ec3 100755 (executable)
--- a/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@ -169,7 +169,7 @@ public class APopupMenu extends java.awt.PopupMenu implements
       remove(groupMenu);
     }
 
-    if (links != null && links.size() > 0)
+    if (seq!=null && links != null && links.size() > 0)
     {
       Menu linkMenu = new Menu("Link");
       String link;
@@ -185,7 +185,7 @@ public class APopupMenu extends java.awt.PopupMenu implements
         final String target = urlLink.getTarget(); // link.substring(0,
         // link.indexOf("|"));
         final String label = urlLink.getLabel();
-        if (urlLink.isDynamic())
+        if (seq!=null && urlLink.isDynamic())
         {
 
           // collect matching db-refs