From 6a89252231240a51ea870ef5d04bae1611cf2ec3 Mon Sep 17 00:00:00 2001 From: jprocter Date: Thu, 24 May 2012 11:04:38 +0100 Subject: [PATCH] patch for occasional NPE when applet is quit --- src/jalview/appletgui/AlignFrame.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java index 842f82d..834b904 100644 --- a/src/jalview/appletgui/AlignFrame.java +++ b/src/jalview/appletgui/AlignFrame.java @@ -1286,8 +1286,13 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, ItemLis public void closeMenuItem_actionPerformed() { PaintRefresher.RemoveComponent(alignPanel); - PaintRefresher.RemoveComponent(alignPanel.seqPanel.seqCanvas); - PaintRefresher.RemoveComponent(alignPanel.idPanel.idCanvas); + if (alignPanel.seqPanel!=null && alignPanel.seqPanel.seqCanvas!=null) + { + PaintRefresher.RemoveComponent(alignPanel.seqPanel.seqCanvas); + } + if (alignPanel.idPanel!=null && alignPanel.idPanel.idCanvas!=null) { + PaintRefresher.RemoveComponent(alignPanel.idPanel.idCanvas); + } if (PaintRefresher.components.size() == 0 && viewport.applet == null) { -- 1.7.10.2