From: Jim Procter <j.procter@dundee.ac.uk>
Date: Tue, 19 Apr 2022 14:02:17 +0000 (+0100)
Subject: Merge branch 'bug/JAL-3997_NPE_in_wrapped_mode' into develop
X-Git-Tag: Release_2_11_2_6~68
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=ae50721a94cd972c0e2afb2f97a02f570e86b1a7;hp=f41806761ec9086c852941a7f91c890190fb522a

Merge branch 'bug/JAL-3997_NPE_in_wrapped_mode' into develop
---

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 54e3db7..111b4c0 100644
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -1184,7 +1184,8 @@ public class SeqPanel extends JPanel
 
     String tooltip = AnnotationPanel.buildToolTip(anns[rowIndex], column,
             anns);
-    if (!tooltip.equals(lastTooltip))
+    if (tooltip == null ? tooltip != lastTooltip
+            : !tooltip.equals(lastTooltip))
     {
       lastTooltip = tooltip;
       lastFormattedTooltip = tooltip == null ? null