From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 19 Feb 2020 18:43:05 +0000 (+0000)
Subject: JAL-3187 - tabbed pane is nulled when feature settings is closed but not featureSetti... 
X-Git-Tag: Develop-2_11_2_0-d20201215~101^2~7
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a983b2e80865eda767b4223934afa4f50983f48d;p=jalview.git

JAL-3187 - tabbed pane is nulled when feature settings is closed but not featureSettingsUI - check both are non-null or reconstruct
---

diff --git a/src/jalview/gui/SplitFrame.java b/src/jalview/gui/SplitFrame.java
index dca77bf..f9b5aa1 100644
--- a/src/jalview/gui/SplitFrame.java
+++ b/src/jalview/gui/SplitFrame.java
@@ -861,7 +861,7 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI
           FeatureSettingsControllerGuiI featureSettings)
   {
     boolean showInternalFrame = false;
-    if (featureSettingsUI == null)
+    if (featureSettingsUI == null || featureSettingsPanels == null)
     {
       showInternalFrame = true;
       featureSettingsPanels = new JTabbedPane();