From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 11 Nov 2016 13:40:57 +0000 (+0000)
Subject: JAL-2295 improved integrity of 'isFinishedInit' flag
X-Git-Tag: Release_2_11_0~62^2~56
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=742b61afae99cb551f7ac4454d97059dc3627829;p=jalview.git

JAL-2295 improved integrity of 'isFinishedInit' flag
---

diff --git a/src/jalview/gui/ChimeraViewFrame.java b/src/jalview/gui/ChimeraViewFrame.java
index 1313476..d68cce8 100644
--- a/src/jalview/gui/ChimeraViewFrame.java
+++ b/src/jalview/gui/ChimeraViewFrame.java
@@ -432,7 +432,6 @@ public class ChimeraViewFrame extends StructureViewerBase
    */
   void initChimera()
   {
-    jmb.setFinishedInit(false);
     jalview.gui.Desktop.addInternalFrame(this,
             jmb.getViewerTitle("Chimera", true), getBounds().width,
             getBounds().height);
@@ -457,7 +456,6 @@ public class ChimeraViewFrame extends StructureViewerBase
                         + chimeraSessionFile);
       }
     }
-    jmb.setFinishedInit(true);
 
     jmb.startChimeraListener();
   }
@@ -663,6 +661,7 @@ public class ChimeraViewFrame extends StructureViewerBase
 
     if (files.length() > 0)
     {
+      jmb.setFinishedInit(false);
       if (!addingStructures)
       {
         try
@@ -674,7 +673,7 @@ public class ChimeraViewFrame extends StructureViewerBase
         }
       }
       int num = -1;
-      jmb.setFinishedInit(false);
+
       for (PDBEntry pe : filePDB)
       {
         num++;
@@ -720,6 +719,7 @@ public class ChimeraViewFrame extends StructureViewerBase
           }
         }
       }
+
       jmb.setFinishedInit(true);
       jmb.setLoadingFromArchive(false);