git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy up group size after alignmentChanged
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationPanel.java
diff --git
a/src/jalview/gui/AnnotationPanel.java
b/src/jalview/gui/AnnotationPanel.java
index
417eb8c
..
315b141
100755
(executable)
--- a/
src/jalview/gui/AnnotationPanel.java
+++ b/
src/jalview/gui/AnnotationPanel.java
@@
-108,7
+108,6
@@
public class AnnotationPanel extends JPanel implements MouseListener,
public int adjustPanelHeight()
\r
{
\r
// setHeight of panels
\r
public int adjustPanelHeight()
\r
{
\r
// setHeight of panels
\r
- image = null;
\r
AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();
\r
int height = 0;
\r
\r
AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();
\r
int height = 0;
\r
\r
@@
-659,6
+658,10
@@
public class AnnotationPanel extends JPanel implements MouseListener,
{
\r
if(av.updatingConsensus || av.updatingConservation)
\r
{
\r
{
\r
if(av.updatingConsensus || av.updatingConservation)
\r
{
\r
+ if(image==null)
\r
+ {
\r
+ return;
\r
+ }
\r
//We'll keep a record of the old image,
\r
//and draw a faded image until the calculation
\r
//has completed
\r
//We'll keep a record of the old image,
\r
//and draw a faded image until the calculation
\r
//has completed
\r