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 (file)
--- 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);