X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAppJmol.java;h=c2a7299d66a176a36d722a794166421d507c21e9;hb=3412b273e964fb1a9d22564b04a5f0c827ec2461;hp=a3f67786a622e63d697698c2811b48b11a2406f0;hpb=4e2bca9bf83325efbad4714bf232c71ae6f0cfe7;p=jalview.git diff --git a/src/jalview/gui/AppJmol.java b/src/jalview/gui/AppJmol.java index a3f6778..c2a7299 100644 --- a/src/jalview/gui/AppJmol.java +++ b/src/jalview/gui/AppJmol.java @@ -57,6 +57,7 @@ import jalview.datamodel.AlignmentI; import jalview.datamodel.ColumnSelection; import jalview.datamodel.PDBEntry; import jalview.datamodel.SequenceI; +import jalview.gui.StructureViewer.ViewerType; import jalview.io.AppletFormatAdapter; import jalview.io.JalviewFileChooser; import jalview.io.JalviewFileView; @@ -1083,7 +1084,7 @@ public class AppJmol extends StructureViewerBase getSize(currentSize); g.getClipBounds(rectClip); - if (jmb.fileLoadingError != null) + if (jmb != null && jmb.fileLoadingError != null) { g.setColor(Color.black); g.fillRect(0, 0, currentSize.width, currentSize.height); @@ -1234,4 +1235,10 @@ public class AppJmol extends StructureViewerBase return jmb == null ? null : jmb.viewer.getStateInfo(); } + @Override + public ViewerType getViewerType() + { + return ViewerType.JMOL; + } + }