From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 9 Aug 2017 08:09:56 +0000 (+0100)
Subject: Merge branch 'bug/JAL-2634' into develop
X-Git-Tag: Release_2_10_3b1~132^2~10
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8a0c21a00b4ac6925f6b6a04d1ea43cff44eea50;hp=0a7cea2df922f37196de9242fb7b02c180f7f828;p=jalview.git

Merge branch 'bug/JAL-2634' into develop
---

diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java
index 4147177..d679217 100644
--- a/src/jalview/appletgui/AlignmentPanel.java
+++ b/src/jalview/appletgui/AlignmentPanel.java
@@ -643,7 +643,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
 
   public void setWrapAlignment(boolean wrap)
   {
-    vpRanges.setStartSeq(0);
+    vpRanges.setStartEndSeq(0, vpRanges.getVisibleAlignmentHeight());
     vpRanges.setStartRes(0);
     scalePanelHolder.setVisible(!wrap);
 
diff --git a/src/jalview/appletgui/AnnotationPanel.java b/src/jalview/appletgui/AnnotationPanel.java
index 39b718d..417bb06 100755
--- a/src/jalview/appletgui/AnnotationPanel.java
+++ b/src/jalview/appletgui/AnnotationPanel.java
@@ -634,7 +634,7 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI,
 
   public void fastPaint(int horizontal)
   {
-    if (horizontal == 0
+    if (horizontal == 0 || gg == null
             || av.getAlignment().getAlignmentAnnotation() == null
             || av.getAlignment().getAlignmentAnnotation().length < 1)
     {